authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2026-05-29 05:32:48 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2026-05-29 05:59:49 -07:00
log1cdce9c329527a6326be7033b64e6cda6a54c5f7
tree7901948e5e98e6ab74a7904e99d2043c4726d628
parent574723d4fd9c43360805c462feda8a342f4aba77
signaturebadge-check Signed by SSH key SHA256:4hHJbtBRU58AYXwjL7fkz2fnQHdiye8x1QpTCQ0sHNw

deps: update all

10 files changed, 170 insertions(+), 114 deletions(-)

.github/workflows/push.yml-6
......@@ -29,12 +29,8 @@ jobs:
2929
3030 # Build All
3131 - run: ./build_release.sh x86_64-linux-musl
32 - run: ./build_release.sh x86_64-macos-none
33 - run: ./build_release.sh x86_64-windows-gnu
3432
3533 - run: ./build_release.sh aarch64-linux-musl
36 - run: ./build_release.sh aarch64-macos-none
37 - run: ./build_release.sh aarch64-windows-gnu
3834
3935 - run: ./build_release.sh riscv64-linux-musl
4036
......@@ -44,8 +40,6 @@ jobs:
4440
4541 - run: ./build_release.sh s390x-linux-musl
4642
47 - run: ./build_release.sh loongarch64-linux-musl
48
4943 # Test
5044 - run: zigmod version
5145 - run: zigmod ci
build_all_zig.sh-6
......@@ -6,12 +6,8 @@ zig build
66
77targets="
88x86_64-linux-musl
9x86_64-macos-none
10x86_64-windows-gnu
119
1210aarch64-linux-musl
13aarch64-macos-none
14aarch64-windows-gnu
1511
1612riscv64-linux-musl
1713
......@@ -20,8 +16,6 @@ powerpc64le-linux-musl
2016mips64el-linux-muslabi64
2117
2218s390x-linux-musl
23
24loongarch64-linux-musl
2519"
2620
2721for item in $targets
deps.zig+115-76
......@@ -54,26 +54,30 @@ pub fn fetch(exe: *std.Build.Step.Compile) *std.Build.Step {
5454 const root = if (@field(package_data, decl.name).store) |_| b.cache_root.path.? else ".";
5555 if (path.* != null) path.* = b.fmt("{s}/zigmod/deps{s}", .{ root, path.*.? });
5656 }
57 step.dependOn(&GitExactStep.create(b, "https://github.com/marlersoft/zigwin32", "d21b419d808215e1f82605fdaddc49750bfa3bca").step);
58 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/arqv-ini", "f1a72055884bd5bc0ffb93ba706c9212139d61b9").step);
59 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/iguanaTLS", "b0e810ba8508681935ea7a5af857cc197dcdd279").step);
60 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zfetch", "ec3c02114dec5deff3310b590e69ce0aeb67b95b").step);
61 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-ansi", "18c6c24d692df31a17f78299c4a539c935d1feb1").step);
62 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-detect-license", "9b85f69e9adc28ec70a217c07b86046e331d3485").step);
63 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-extras", "5c4543acadb6c24c05d68f79e4c9d2093457a629").step);
64 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-git", "b206fa9978ef2cc06bab4d307c7ed07f1f3b88af").step);
65 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-inquirer", "3bee7b28a37f3d0898119ef095687467fa907d4b").step);
66 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-intrusive-parser", "eabd7f7b9b8defdbba5504d9ce2c93e1065ca34b").step);
67 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-json", "92dd6f67bbb52f060d5ac20719142b0211854290").step);
68 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-leven", "abcde0e877df670f96671bdca5b81b0e809df0d4").step);
69 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-licenses", "86fc3f6cb4dcc2847832524a3f80d520c7a6577c").step);
70 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-licenses-text", "a4a66621b3cccdf05e62e0152cf2cd43e9072e97").step);
71 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-time", "25165db8e626434ab6eae2cff64ba5e72e4fa062").step);
72 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-tracer", "cc75b7f652c7cd51cbfa6e3c7e8155cd153bb68b").step);
73 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-yaml", "10e8df67c534e186d851ed48e8895374d9a454e9").step);
57 step.dependOn(&GitExactStep.create(b, "https://github.com/marlersoft/zigwin32", "ec98bb4d9eea532320a8551720a9e3ec6de64994").step);
58 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/arqv-ini", "ab427a4de4f875eaa39ee56a29114fc020431546").step);
59 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/iguanaTLS", "3450aaf3ca47986540e2b0258c2affc45af64ea2").step);
60 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zfetch", "40d141bf7db81f05a83cce5f2edc4b14e41a5c34").step);
61 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-ansi", "5f89211a749aef6bf518889c0467ceb24825c055").step);
62 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-detect-license", "8d553ba6283f778965678ee73b17ae1e2019440d").step);
63 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-extras", "c2c581aa6a38438dd9ed8da0f59019691c5dd45d").step);
64 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-git", "70d5ded3d5699c452cb3f4298ee2822cfc0f814e").step);
65 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-inquirer", "4cddefa42744d61067567b0b36b5d2bb376e5ae3").step);
66 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-intrusive-parser", "eec3155dc8188b8440cb6097cc436f49511f01cd").step);
67 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-json", "80e943ac8734b91da3560c8f45bbe702d833ac11").step);
68 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-leven", "618eddde4ffbc6d34100e4bc6aa654d41161537a").step);
69 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-licenses", "6b59e45d33a58a5756b2d671a40703f1d110271e").step);
70 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-licenses-text", "cf0d7f870e85bf4cc35e56532b9e6dd37f9d20dd").step);
71 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-nfs", "cd5a750bf6d58fa355efe2223c3f9c0626198f13").step);
72 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-nio", "c50f286c78a4a9704ac3f9fecd7c351e7da89e02").step);
73 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-sys-linux", "9edefde5fcf96894b6aa4ab60241940bba65debf").step);
74 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-time", "6e4e3983cea4fe7f705ce6c6606832fca409a4c7").step);
75 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-tracer", "b2c23066c0431542cbc97aedadd9c8890c298e7b").step);
76 step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-yaml", "54fd85b458b7cf1b81ebe6503d61ca82804d1db6").step);
7477 step.dependOn(&GitExactStep.create(b, "https://github.com/truemedian/hzzp", "ab212bd208f0eb54d85861679677c5e3dc9bb543").step);
75 step.dependOn(&GitExactStep.create(b, "https://github.com/ziglibs/known-folders", "aa24df42183ad415d10bc0a33e6238c437fc0f59").step);
78 step.dependOn(&GitExactStep.create(b, "https://github.com/madler/zlib", "da607da739fa6047df13e66a2af6b8bec7c2a498").step);
7679 step.dependOn(&GitExactStep.create(b, "https://github.com/yaml/libyaml", "2c891fc7a770e8ba2fec34fc6b545c672beb37e6").step);
80 step.dependOn(&GitExactStep.create(b, "https://github.com/ziglibs/known-folders", "aa24df42183ad415d10bc0a33e6238c437fc0f59").step);
7781 return step;
7882}
7983
......@@ -120,13 +124,17 @@ pub const Package = struct {
120124 }
121125 const b = exe.step.owner;
122126
123 const result = b.createModule(.{});
127 const result = b.createModule(.{
128 .target = exe.root_module.resolved_target,
129 });
130 const target = result.resolved_target.?.result;
124131 const dummy_library = b.addStaticLibrary(.{
125 .name = "dummy",
132 .name = b.fmt("dummy-{s}", .{self.name}),
126133 .target = exe.root_module.resolved_target orelse b.graph.host,
127134 .optimize = exe.root_module.optimize.?,
128135 });
129136 dummy_library.step.dependOn(fetch_step);
137 var links: u32 = 0;
130138 if (self.entry) |capture| {
131139 result.root_source_file = .{ .cwd_relative = capture };
132140 }
......@@ -146,17 +154,22 @@ pub const Package = struct {
146154 result.addIncludePath(.{ .cwd_relative = b.fmt("{s}/zigmod/deps{s}/{s}", .{ b.cache_root.path.?, self.store.?, item }) });
147155 dummy_library.addIncludePath(.{ .cwd_relative = b.fmt("{s}/zigmod/deps{s}/{s}", .{ b.cache_root.path.?, self.store.?, item }) });
148156 link_lib_c = true;
157 links += 1;
149158 }
150159 for (self.c_source_files) |item| {
151160 dummy_library.addCSourceFile(.{ .file = .{ .cwd_relative = b.fmt("{s}/zigmod/deps{s}/{s}", .{ b.cache_root.path.?, self.store.?, item }) }, .flags = self.c_source_flags });
161 links += 1;
152162 }
153163 for (self.system_libs) |item| {
164 if (std.zig.target.isLibCLibName(target, item)) continue;
154165 dummy_library.linkSystemLibrary(item);
166 links += 1;
155167 }
156168 for (self.frameworks) |item| {
157169 dummy_library.linkFramework(item);
170 links += 1;
158171 }
159 if (self.c_source_files.len > 0 or self.system_libs.len > 0 or self.frameworks.len > 0) {
172 if (links > 0) {
160173 dummy_library.linkLibC();
161174 exe.root_module.linkLibrary(dummy_library);
162175 link_lib_c = true;
......@@ -176,92 +189,112 @@ fn checkMinZig(current: std.SemanticVersion, exe: *std.Build.Step.Compile) void
176189
177190pub const package_data = struct {
178191 pub var _o6ogpor87xc2 = Package{
179 .store = "/git/github.com/marlersoft/zigwin32/d21b419d808215e1f82605fdaddc49750bfa3bca",
192 .store = "/git/github.com/marlersoft/zigwin32/ec98bb4d9eea532320a8551720a9e3ec6de64994",
180193 .name = "win32",
181 .entry = "/git/github.com/marlersoft/zigwin32/d21b419d808215e1f82605fdaddc49750bfa3bca/win32.zig",
194 .entry = "/git/github.com/marlersoft/zigwin32/ec98bb4d9eea532320a8551720a9e3ec6de64994/win32.zig",
182195 };
183196 pub var _u7sysdckdymi = Package{
184 .store = "/git/github.com/nektro/arqv-ini/f1a72055884bd5bc0ffb93ba706c9212139d61b9",
197 .store = "/git/github.com/nektro/arqv-ini/ab427a4de4f875eaa39ee56a29114fc020431546",
185198 .name = "ini",
186 .entry = "/git/github.com/nektro/arqv-ini/f1a72055884bd5bc0ffb93ba706c9212139d61b9/src/ini.zig",
199 .entry = "/git/github.com/nektro/arqv-ini/ab427a4de4f875eaa39ee56a29114fc020431546/src/ini.zig",
187200 };
188201 pub var _csbnipaad8n7 = Package{
189 .store = "/git/github.com/nektro/iguanaTLS/b0e810ba8508681935ea7a5af857cc197dcdd279",
202 .store = "/git/github.com/nektro/iguanaTLS/3450aaf3ca47986540e2b0258c2affc45af64ea2",
190203 .name = "iguanaTLS",
191 .entry = "/git/github.com/nektro/iguanaTLS/b0e810ba8508681935ea7a5af857cc197dcdd279/src/main.zig",
204 .entry = "/git/github.com/nektro/iguanaTLS/3450aaf3ca47986540e2b0258c2affc45af64ea2/src/main.zig",
192205 };
193206 pub var _s84v9o48ucb0 = Package{
194 .store = "/git/github.com/nektro/zig-ansi/18c6c24d692df31a17f78299c4a539c935d1feb1",
207 .store = "/git/github.com/nektro/zig-ansi/5f89211a749aef6bf518889c0467ceb24825c055",
195208 .name = "ansi",
196 .entry = "/git/github.com/nektro/zig-ansi/18c6c24d692df31a17f78299c4a539c935d1feb1/src/lib.zig",
209 .entry = "/git/github.com/nektro/zig-ansi/5f89211a749aef6bf518889c0467ceb24825c055/src/lib.zig",
197210 };
198211 pub var _f7dubzb7cyqe = Package{
199 .store = "/git/github.com/nektro/zig-extras/5c4543acadb6c24c05d68f79e4c9d2093457a629",
212 .store = "/git/github.com/nektro/zig-extras/c2c581aa6a38438dd9ed8da0f59019691c5dd45d",
200213 .name = "extras",
201 .entry = "/git/github.com/nektro/zig-extras/5c4543acadb6c24c05d68f79e4c9d2093457a629/src/lib.zig",
214 .entry = "/git/github.com/nektro/zig-extras/c2c581aa6a38438dd9ed8da0f59019691c5dd45d/src/lib.zig",
202215 };
203216 pub var _c1xirp1ota5p = Package{
204 .store = "/git/github.com/nektro/zig-inquirer/3bee7b28a37f3d0898119ef095687467fa907d4b",
217 .store = "/git/github.com/nektro/zig-inquirer/4cddefa42744d61067567b0b36b5d2bb376e5ae3",
205218 .name = "inquirer",
206 .entry = "/git/github.com/nektro/zig-inquirer/3bee7b28a37f3d0898119ef095687467fa907d4b/src/lib.zig",
219 .entry = "/git/github.com/nektro/zig-inquirer/4cddefa42744d61067567b0b36b5d2bb376e5ae3/src/lib.zig",
207220 .deps = &[_]*Package{ &_s84v9o48ucb0 },
208221 };
209 pub var _7l3oxw6nqqws = Package{
210 .store = "/git/github.com/nektro/zig-intrusive-parser/eabd7f7b9b8defdbba5504d9ce2c93e1065ca34b",
211 .name = "intrusive-parser",
212 .entry = "/git/github.com/nektro/zig-intrusive-parser/eabd7f7b9b8defdbba5504d9ce2c93e1065ca34b/intrusive_parser.zig",
213 .deps = &[_]*Package{ &_f7dubzb7cyqe },
214 };
215222 pub var _96h80ezrvj7i = Package{
216 .store = "/git/github.com/nektro/zig-leven/abcde0e877df670f96671bdca5b81b0e809df0d4",
223 .store = "/git/github.com/nektro/zig-leven/618eddde4ffbc6d34100e4bc6aa654d41161537a",
217224 .name = "leven",
218 .entry = "/git/github.com/nektro/zig-leven/abcde0e877df670f96671bdca5b81b0e809df0d4/src/lib.zig",
225 .entry = "/git/github.com/nektro/zig-leven/618eddde4ffbc6d34100e4bc6aa654d41161537a/src/lib.zig",
219226 };
220227 pub var _0npcrzfdlrvk = Package{
221 .store = "/git/github.com/nektro/zig-licenses/86fc3f6cb4dcc2847832524a3f80d520c7a6577c",
228 .store = "/git/github.com/nektro/zig-licenses/6b59e45d33a58a5756b2d671a40703f1d110271e",
222229 .name = "licenses",
223 .entry = "/git/github.com/nektro/zig-licenses/86fc3f6cb4dcc2847832524a3f80d520c7a6577c/src/lib.zig",
230 .entry = "/git/github.com/nektro/zig-licenses/6b59e45d33a58a5756b2d671a40703f1d110271e/src/lib.zig",
224231 };
225 pub var _pt88y5d80m25 = Package{
226 .store = "/git/github.com/nektro/zig-licenses-text/a4a66621b3cccdf05e62e0152cf2cd43e9072e97",
227 .name = "licenses-text",
228 .entry = "/git/github.com/nektro/zig-licenses-text/a4a66621b3cccdf05e62e0152cf2cd43e9072e97/src/lib.zig",
232 pub var _h7tv7ayhffak = Package{
233 .store = "/git/github.com/nektro/zig-sys-linux/9edefde5fcf96894b6aa4ab60241940bba65debf",
234 .name = "sys-linux",
235 .entry = "/git/github.com/nektro/zig-sys-linux/9edefde5fcf96894b6aa4ab60241940bba65debf/mod.zig",
236 .deps = &[_]*Package{ },
237 .system_libs = &.{ "c" },
229238 };
230 pub var _2ovav391ivak = Package{
231 .store = "/git/github.com/nektro/zig-detect-license/9b85f69e9adc28ec70a217c07b86046e331d3485",
232 .name = "detect-license",
233 .entry = "/git/github.com/nektro/zig-detect-license/9b85f69e9adc28ec70a217c07b86046e331d3485/src/lib.zig",
234 .deps = &[_]*Package{ &_pt88y5d80m25, &_96h80ezrvj7i },
239 pub var _kscsl0145t7x = Package{
240 .store = "/git/github.com/nektro/zig-nio/c50f286c78a4a9704ac3f9fecd7c351e7da89e02",
241 .name = "nio",
242 .entry = "/git/github.com/nektro/zig-nio/c50f286c78a4a9704ac3f9fecd7c351e7da89e02/nio.zig",
243 .deps = &[_]*Package{ &_h7tv7ayhffak, &_f7dubzb7cyqe },
244 };
245 pub var _7l3oxw6nqqws = Package{
246 .store = "/git/github.com/nektro/zig-intrusive-parser/eec3155dc8188b8440cb6097cc436f49511f01cd",
247 .name = "intrusive-parser",
248 .entry = "/git/github.com/nektro/zig-intrusive-parser/eec3155dc8188b8440cb6097cc436f49511f01cd/intrusive_parser.zig",
249 .deps = &[_]*Package{ &_f7dubzb7cyqe, &_kscsl0145t7x },
235250 };
236251 pub var _iecwp4b3bsfm = Package{
237 .store = "/git/github.com/nektro/zig-time/25165db8e626434ab6eae2cff64ba5e72e4fa062",
252 .store = "/git/github.com/nektro/zig-time/6e4e3983cea4fe7f705ce6c6606832fca409a4c7",
238253 .name = "time",
239 .entry = "/git/github.com/nektro/zig-time/25165db8e626434ab6eae2cff64ba5e72e4fa062/time.zig",
240 .deps = &[_]*Package{ &_f7dubzb7cyqe },
254 .entry = "/git/github.com/nektro/zig-time/6e4e3983cea4fe7f705ce6c6606832fca409a4c7/time.zig",
255 .deps = &[_]*Package{ &_f7dubzb7cyqe, &_h7tv7ayhffak },
256 };
257 pub var _vph9l0hxpeze = Package{
258 .store = "/git/github.com/nektro/zig-nfs/cd5a750bf6d58fa355efe2223c3f9c0626198f13",
259 .name = "nfs",
260 .entry = "/git/github.com/nektro/zig-nfs/cd5a750bf6d58fa355efe2223c3f9c0626198f13/nfs.zig",
261 .deps = &[_]*Package{ &_h7tv7ayhffak, &_kscsl0145t7x, &_iecwp4b3bsfm },
241262 };
242263 pub var _ede2wygpe1iy = Package{
243 .store = "/git/github.com/nektro/zig-tracer/cc75b7f652c7cd51cbfa6e3c7e8155cd153bb68b",
264 .store = "/git/github.com/nektro/zig-tracer/b2c23066c0431542cbc97aedadd9c8890c298e7b",
244265 .name = "tracer",
245 .entry = "/git/github.com/nektro/zig-tracer/cc75b7f652c7cd51cbfa6e3c7e8155cd153bb68b/src/mod.zig",
246 .deps = &[_]*Package{ &_f7dubzb7cyqe },
266 .entry = "/git/github.com/nektro/zig-tracer/b2c23066c0431542cbc97aedadd9c8890c298e7b/src/mod.zig",
267 .deps = &[_]*Package{ &_f7dubzb7cyqe, &_h7tv7ayhffak, &_vph9l0hxpeze, &_kscsl0145t7x, &_iecwp4b3bsfm },
247268 };
248269 pub var _0k64oe2nuzvj = Package{
249 .store = "/git/github.com/nektro/zig-git/b206fa9978ef2cc06bab4d307c7ed07f1f3b88af",
270 .store = "/git/github.com/nektro/zig-git/70d5ded3d5699c452cb3f4298ee2822cfc0f814e",
250271 .name = "git",
251 .entry = "/git/github.com/nektro/zig-git/b206fa9978ef2cc06bab4d307c7ed07f1f3b88af/git.zig",
252 .deps = &[_]*Package{ &_iecwp4b3bsfm, &_f7dubzb7cyqe, &_ede2wygpe1iy },
272 .entry = "/git/github.com/nektro/zig-git/70d5ded3d5699c452cb3f4298ee2822cfc0f814e/git.zig",
273 .deps = &[_]*Package{ &_iecwp4b3bsfm, &_f7dubzb7cyqe, &_ede2wygpe1iy, &_vph9l0hxpeze, &_kscsl0145t7x, &_0e2d06bb494b },
253274 };
254275 pub var _ocmr9rtohgcc = Package{
255 .store = "/git/github.com/nektro/zig-json/92dd6f67bbb52f060d5ac20719142b0211854290",
276 .store = "/git/github.com/nektro/zig-json/80e943ac8734b91da3560c8f45bbe702d833ac11",
256277 .name = "json",
257 .entry = "/git/github.com/nektro/zig-json/92dd6f67bbb52f060d5ac20719142b0211854290/json.zig",
258 .deps = &[_]*Package{ &_f7dubzb7cyqe, &_ede2wygpe1iy, &_7l3oxw6nqqws },
278 .entry = "/git/github.com/nektro/zig-json/80e943ac8734b91da3560c8f45bbe702d833ac11/json.zig",
279 .deps = &[_]*Package{ &_f7dubzb7cyqe, &_ede2wygpe1iy, &_7l3oxw6nqqws, &_kscsl0145t7x },
280 };
281 pub var _pt88y5d80m25 = Package{
282 .store = "/git/github.com/nektro/zig-licenses-text/cf0d7f870e85bf4cc35e56532b9e6dd37f9d20dd",
283 .name = "licenses-text",
284 .entry = "/git/github.com/nektro/zig-licenses-text/cf0d7f870e85bf4cc35e56532b9e6dd37f9d20dd/src/lib.zig",
285 .deps = &[_]*Package{ &_ocmr9rtohgcc },
286 };
287 pub var _2ovav391ivak = Package{
288 .store = "/git/github.com/nektro/zig-detect-license/8d553ba6283f778965678ee73b17ae1e2019440d",
289 .name = "detect-license",
290 .entry = "/git/github.com/nektro/zig-detect-license/8d553ba6283f778965678ee73b17ae1e2019440d/src/lib.zig",
291 .deps = &[_]*Package{ &_pt88y5d80m25, &_96h80ezrvj7i },
259292 };
260293 pub var _g982zq6e8wsv = Package{
261 .store = "/git/github.com/nektro/zig-yaml/10e8df67c534e186d851ed48e8895374d9a454e9",
294 .store = "/git/github.com/nektro/zig-yaml/54fd85b458b7cf1b81ebe6503d61ca82804d1db6",
262295 .name = "yaml",
263 .entry = "/git/github.com/nektro/zig-yaml/10e8df67c534e186d851ed48e8895374d9a454e9/yaml.zig",
264 .deps = &[_]*Package{ &_8mdbh0zuneb0, &_f7dubzb7cyqe },
296 .entry = "/git/github.com/nektro/zig-yaml/54fd85b458b7cf1b81ebe6503d61ca82804d1db6/yaml.zig",
297 .deps = &[_]*Package{ &_8mdbh0zuneb0 },
265298 };
266299 pub var _9k24gimke1an = Package{
267300 .store = "/git/github.com/truemedian/hzzp/ab212bd208f0eb54d85861679677c5e3dc9bb543",
......@@ -269,11 +302,23 @@ pub const package_data = struct {
269302 .entry = "/git/github.com/truemedian/hzzp/ab212bd208f0eb54d85861679677c5e3dc9bb543/src/main.zig",
270303 };
271304 pub var _ejw82j2ipa0e = Package{
272 .store = "/git/github.com/nektro/zfetch/ec3c02114dec5deff3310b590e69ce0aeb67b95b",
305 .store = "/git/github.com/nektro/zfetch/40d141bf7db81f05a83cce5f2edc4b14e41a5c34",
273306 .name = "zfetch",
274 .entry = "/git/github.com/nektro/zfetch/ec3c02114dec5deff3310b590e69ce0aeb67b95b/src/main.zig",
307 .entry = "/git/github.com/nektro/zfetch/40d141bf7db81f05a83cce5f2edc4b14e41a5c34/src/main.zig",
275308 .deps = &[_]*Package{ &_9k24gimke1an, &_csbnipaad8n7 },
276309 };
310 pub var _0e2d06bb494b = Package{
311 .store = "/git/github.com/madler/zlib/da607da739fa6047df13e66a2af6b8bec7c2a498",
312 .c_include_dirs = &.{ "" },
313 .c_source_files = &.{ "inftrees.c", "inflate.c", "adler32.c", "zutil.c", "trees.c", "gzclose.c", "gzwrite.c", "gzread.c", "deflate.c", "compress.c", "crc32.c", "infback.c", "gzlib.c", "uncompr.c", "inffast.c" },
314 .c_source_flags = &.{ "-DZ_HAVE_UNISTD_H=1" },
315 };
316 pub var _8mdbh0zuneb0 = Package{
317 .store = "/git/github.com/yaml/libyaml/2c891fc7a770e8ba2fec34fc6b545c672beb37e6",
318 .c_include_dirs = &.{ "include" },
319 .c_source_files = &.{ "src/api.c", "src/dumper.c", "src/emitter.c", "src/loader.c", "src/parser.c", "src/reader.c", "src/scanner.c", "src/writer.c" },
320 .c_source_flags = &.{ "-DYAML_VERSION_MAJOR=0", "-DYAML_VERSION_MINOR=2", "-DYAML_VERSION_PATCH=5", "-DYAML_VERSION_STRING=\"0.2.5\"", "-DYAML_DECLARE_STATIC=1" },
321 };
277322 pub var _2ta738wrqbaq = Package{
278323 .store = "/git/github.com/ziglibs/known-folders/aa24df42183ad415d10bc0a33e6238c437fc0f59",
279324 .name = "known-folders",
......@@ -282,16 +327,10 @@ pub const package_data = struct {
282327 pub var _89ujp8gq842x = Package{
283328 .name = "zigmod",
284329 .entry = "/../..//src/lib.zig",
285 .deps = &[_]*Package{ &_g982zq6e8wsv, &_s84v9o48ucb0, &_2ta738wrqbaq, &_0npcrzfdlrvk, &_ejw82j2ipa0e, &_2ovav391ivak, &_c1xirp1ota5p, &_u7sysdckdymi, &_iecwp4b3bsfm, &_f7dubzb7cyqe, &_0k64oe2nuzvj, &_ocmr9rtohgcc },
330 .deps = &[_]*Package{ &_g982zq6e8wsv, &_s84v9o48ucb0, &_2ta738wrqbaq, &_0npcrzfdlrvk, &_ejw82j2ipa0e, &_2ovav391ivak, &_c1xirp1ota5p, &_u7sysdckdymi, &_iecwp4b3bsfm, &_f7dubzb7cyqe, &_0k64oe2nuzvj, &_ocmr9rtohgcc, &_kscsl0145t7x, &_vph9l0hxpeze },
286331 };
287332 pub var _root = Package{
288333 };
289 pub var _8mdbh0zuneb0 = Package{
290 .store = "/git/github.com/yaml/libyaml/2c891fc7a770e8ba2fec34fc6b545c672beb37e6",
291 .c_include_dirs = &.{ "include" },
292 .c_source_files = &.{ "src/api.c", "src/dumper.c", "src/emitter.c", "src/loader.c", "src/parser.c", "src/reader.c", "src/scanner.c", "src/writer.c" },
293 .c_source_flags = &.{ "-DYAML_VERSION_MAJOR=0", "-DYAML_VERSION_MINOR=2", "-DYAML_VERSION_PATCH=5", "-DYAML_VERSION_STRING=\"0.2.5\"", "-DYAML_DECLARE_STATIC=1" },
294 };
295334};
296335
297336pub const packages = [_]*Package{
licenses.txt+12-2
......@@ -8,19 +8,29 @@ MIT:
88- git https://github.com/nektro/zig-ansi
99- git https://github.com/nektro/zig-detect-license
1010- git https://github.com/nektro/zig-extras
11- git https://github.com/nektro/zig-git
1211- git https://github.com/nektro/zig-inquirer
1312- git https://github.com/nektro/zig-json
1413- git https://github.com/nektro/zig-leven
1514- git https://github.com/nektro/zig-licenses
1615- git https://github.com/nektro/zig-licenses-text
16- git https://github.com/nektro/zig-sys-linux
1717- git https://github.com/nektro/zig-time
1818- git https://github.com/nektro/zig-tracer
1919- git https://github.com/nektro/zig-yaml
2020- git https://github.com/truemedian/hzzp
21- git https://github.com/ziglibs/known-folders
2221- git https://github.com/yaml/libyaml
22- git https://github.com/ziglibs/known-folders
2323
2424MPL-2.0:
2525= https://spdx.org/licenses/MPL-2.0
26- git https://github.com/nektro/zig-git
2627- git https://github.com/nektro/zig-intrusive-parser
28- git https://github.com/nektro/zig-nfs
29- git https://github.com/nektro/zig-nio
30
31Zlib:
32= https://spdx.org/licenses/Zlib
33- git https://github.com/madler/zlib
34
35Unspecified:
36- system_lib c
src/cmd/generate.zig+12-3
......@@ -157,13 +157,17 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D
157157 \\ }
158158 \\ const b = exe.step.owner;
159159 \\
160 \\ const result = b.createModule(.{});
160 \\ const result = b.createModule(.{
161 \\ .target = exe.root_module.resolved_target,
162 \\ });
163 \\ const target = result.resolved_target.?.result;
161164 \\ const dummy_library = b.addStaticLibrary(.{
162 \\ .name = "dummy",
165 \\ .name = b.fmt("dummy-{s}", .{self.name}),
163166 \\ .target = exe.root_module.resolved_target orelse b.graph.host,
164167 \\ .optimize = exe.root_module.optimize.?,
165168 \\ });
166169 \\ dummy_library.step.dependOn(fetch_step);
170 \\ var links: u32 = 0;
167171 \\ if (self.entry) |capture| {
168172 \\ result.root_source_file = .{ .cwd_relative = capture };
169173 \\ }
......@@ -183,17 +187,22 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D
183187 \\ result.addIncludePath(.{ .cwd_relative = b.fmt("{s}/zigmod/deps{s}/{s}", .{ b.cache_root.path.?, self.store.?, item }) });
184188 \\ dummy_library.addIncludePath(.{ .cwd_relative = b.fmt("{s}/zigmod/deps{s}/{s}", .{ b.cache_root.path.?, self.store.?, item }) });
185189 \\ link_lib_c = true;
190 \\ links += 1;
186191 \\ }
187192 \\ for (self.c_source_files) |item| {
188193 \\ dummy_library.addCSourceFile(.{ .file = .{ .cwd_relative = b.fmt("{s}/zigmod/deps{s}/{s}", .{ b.cache_root.path.?, self.store.?, item }) }, .flags = self.c_source_flags });
194 \\ links += 1;
189195 \\ }
190196 \\ for (self.system_libs) |item| {
197 \\ if (std.zig.target.isLibCLibName(target, item)) continue;
191198 \\ dummy_library.linkSystemLibrary(item);
199 \\ links += 1;
192200 \\ }
193201 \\ for (self.frameworks) |item| {
194202 \\ dummy_library.linkFramework(item);
203 \\ links += 1;
195204 \\ }
196 \\ if (self.c_source_files.len > 0 or self.system_libs.len > 0 or self.frameworks.len > 0) {
205 \\ if (links > 0) {
197206 \\ dummy_library.linkLibC();
198207 \\ exe.root_module.linkLibrary(dummy_library);
199208 \\ link_lib_c = true;
src/cmd/zpm.zig+2-1
......@@ -4,6 +4,7 @@ const gpa = std.heap.c_allocator;
44const zfetch = @import("zfetch");
55const extras = @import("extras");
66const json = @import("json");
7const nio = @import("nio");
78
89const u = @import("./../util/funcs.zig");
910
......@@ -60,7 +61,7 @@ pub fn server_fetch(url: string) !json.Document {
6061 const req = try zfetch.Request.init(gpa, url, null);
6162 defer req.deinit();
6263 try req.do(.GET, null, null);
63 return json.parse(gpa, "", req.reader(), .{ .support_trailing_commas = true, .maximum_depth = 100 });
64 return json.parse(gpa, "", nio.AnyReadable.fromStd(&req.reader()), .{ .support_trailing_commas = true, .maximum_depth = 100 });
6465}
6566
6667pub fn server_fetchArray(url: string) ![]const Package {
src/util/funcs.zig+3-1
......@@ -4,6 +4,7 @@ const gpa = std.heap.c_allocator;
44const extras = @import("extras");
55const git = @import("git");
66const ansi = @import("ansi");
7const nfs = @import("nfs");
78
89//
910//
......@@ -144,7 +145,8 @@ pub fn do_hash(comptime algo: type, data: string) ![algo.digest_length * 2]u8 {
144145
145146/// Returns the result of running `git rev-parse HEAD`
146147pub fn git_rev_HEAD(alloc: std.mem.Allocator, dir: std.fs.Dir) !string {
147 var dirg = try dir.openDir(".git", .{});
148 const ndir: nfs.Dir = .{ .fd = @enumFromInt(dir.fd) };
149 var dirg = try ndir.openDir(".git", .{});
148150 defer dirg.close();
149151 const commitid = try git.getHEAD(alloc, dirg);
150152 return if (commitid) |_| commitid.?.id else error.NotAGitRepo;
src/util/module.zig+1-1
......@@ -182,7 +182,7 @@ pub const Module = struct {
182182 const cpath = extras.trimPrefixEnsure(self.clean_path, "v/") orelse return err;
183183 var iter = std.mem.splitScalar(u8, cpath, '/');
184184 while (iter.next()) |segment| {
185 if (iter.peek() == null) return segment;
185 if (iter.peek() == null) return extras.trimPrefixEnsure(segment, "commit-") orelse return err;
186186 }
187187 unreachable;
188188 },
zig.mod+3
......@@ -13,6 +13,7 @@ dependencies:
1313 name: known-folders
1414 main: known-folders.zig
1515 license: MIT
16 version: commit-aa24df42183ad415d10bc0a33e6238c437fc0f59
1617 - src: git https://github.com/nektro/zig-licenses
1718 - src: git https://github.com/nektro/zfetch
1819 - src: git https://github.com/nektro/zig-detect-license
......@@ -22,6 +23,8 @@ dependencies:
2223 - src: git https://github.com/nektro/zig-extras
2324 - src: git https://github.com/nektro/zig-git
2425 - src: git https://github.com/nektro/zig-json
26 - src: git https://github.com/nektro/zig-nio
27 - src: git https://github.com/nektro/zig-nfs
2528
2629root_dependencies:
2730 - src: git https://github.com/marlersoft/zigwin32
zigmod.lock+22-18
......@@ -1,21 +1,25 @@
112
2git https://github.com/marlersoft/zigwin32 commit-d21b419d808215e1f82605fdaddc49750bfa3bca
3git https://github.com/nektro/arqv-ini commit-f1a72055884bd5bc0ffb93ba706c9212139d61b9
4git https://github.com/nektro/iguanaTLS commit-b0e810ba8508681935ea7a5af857cc197dcdd279
5git https://github.com/nektro/zfetch commit-ec3c02114dec5deff3310b590e69ce0aeb67b95b
6git https://github.com/nektro/zig-ansi commit-18c6c24d692df31a17f78299c4a539c935d1feb1
7git https://github.com/nektro/zig-detect-license commit-9b85f69e9adc28ec70a217c07b86046e331d3485
8git https://github.com/nektro/zig-extras commit-5c4543acadb6c24c05d68f79e4c9d2093457a629
9git https://github.com/nektro/zig-git commit-b206fa9978ef2cc06bab4d307c7ed07f1f3b88af
10git https://github.com/nektro/zig-inquirer commit-3bee7b28a37f3d0898119ef095687467fa907d4b
11git https://github.com/nektro/zig-intrusive-parser commit-eabd7f7b9b8defdbba5504d9ce2c93e1065ca34b
12git https://github.com/nektro/zig-json commit-92dd6f67bbb52f060d5ac20719142b0211854290
13git https://github.com/nektro/zig-leven commit-abcde0e877df670f96671bdca5b81b0e809df0d4
14git https://github.com/nektro/zig-licenses commit-86fc3f6cb4dcc2847832524a3f80d520c7a6577c
15git https://github.com/nektro/zig-licenses-text commit-a4a66621b3cccdf05e62e0152cf2cd43e9072e97
16git https://github.com/nektro/zig-time commit-25165db8e626434ab6eae2cff64ba5e72e4fa062
17git https://github.com/nektro/zig-tracer commit-cc75b7f652c7cd51cbfa6e3c7e8155cd153bb68b
18git https://github.com/nektro/zig-yaml commit-10e8df67c534e186d851ed48e8895374d9a454e9
2git https://github.com/marlersoft/zigwin32 commit-ec98bb4d9eea532320a8551720a9e3ec6de64994
3git https://github.com/nektro/arqv-ini commit-ab427a4de4f875eaa39ee56a29114fc020431546
4git https://github.com/nektro/iguanaTLS commit-3450aaf3ca47986540e2b0258c2affc45af64ea2
5git https://github.com/nektro/zfetch commit-40d141bf7db81f05a83cce5f2edc4b14e41a5c34
6git https://github.com/nektro/zig-ansi commit-5f89211a749aef6bf518889c0467ceb24825c055
7git https://github.com/nektro/zig-detect-license commit-8d553ba6283f778965678ee73b17ae1e2019440d
8git https://github.com/nektro/zig-extras commit-c2c581aa6a38438dd9ed8da0f59019691c5dd45d
9git https://github.com/nektro/zig-git commit-70d5ded3d5699c452cb3f4298ee2822cfc0f814e
10git https://github.com/nektro/zig-inquirer commit-4cddefa42744d61067567b0b36b5d2bb376e5ae3
11git https://github.com/nektro/zig-intrusive-parser commit-eec3155dc8188b8440cb6097cc436f49511f01cd
12git https://github.com/nektro/zig-json commit-80e943ac8734b91da3560c8f45bbe702d833ac11
13git https://github.com/nektro/zig-leven commit-618eddde4ffbc6d34100e4bc6aa654d41161537a
14git https://github.com/nektro/zig-licenses commit-6b59e45d33a58a5756b2d671a40703f1d110271e
15git https://github.com/nektro/zig-licenses-text commit-cf0d7f870e85bf4cc35e56532b9e6dd37f9d20dd
16git https://github.com/nektro/zig-nfs commit-cd5a750bf6d58fa355efe2223c3f9c0626198f13
17git https://github.com/nektro/zig-nio commit-c50f286c78a4a9704ac3f9fecd7c351e7da89e02
18git https://github.com/nektro/zig-sys-linux commit-9edefde5fcf96894b6aa4ab60241940bba65debf
19git https://github.com/nektro/zig-time commit-6e4e3983cea4fe7f705ce6c6606832fca409a4c7
20git https://github.com/nektro/zig-tracer commit-b2c23066c0431542cbc97aedadd9c8890c298e7b
21git https://github.com/nektro/zig-yaml commit-54fd85b458b7cf1b81ebe6503d61ca82804d1db6
1922git https://github.com/truemedian/hzzp commit-ab212bd208f0eb54d85861679677c5e3dc9bb543
20git https://github.com/ziglibs/known-folders commit-aa24df42183ad415d10bc0a33e6238c437fc0f59
23git https://github.com/madler/zlib tag-v1.3.2
2124git https://github.com/yaml/libyaml tag-0.2.5
25git https://github.com/ziglibs/known-folders commit-aa24df42183ad415d10bc0a33e6238c437fc0f59