From 827c27ef00d14468fde26506fd4999d96ce7c448 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Wed, 11 Jan 2023 10:43:10 -0800 Subject: [PATCH] update to zig master 0.11.0-dev.874+40ed6ae84 --- .github/workflows/nightly.yml | 2 +- .github/workflows/push.yml | 2 +- README.md | 2 +- deps.zig | 58 +++++++++++++++++------------------ docs/README.md | 2 +- src/common.zig | 4 +-- src/util/module.zig | 2 +- zig.mod | 2 +- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7a19f1548a99ace07d3cb28887b80e5d0b4aaaa1..cabd31447957d2c85e72235d3e6f6cc3f8f92425 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -26,7 +26,7 @@ jobs: - name: Setup Zig uses: goto-bus-stop/setup-zig@v1 with: - version: "0.11.0-dev.193+eed82ca28" + version: "0.11.0-dev.874+40ed6ae84" - run: zig version - run: zig env diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d3f91f0060d7db4d83dd2f47d23c861564617ab1..451579735fbba8b3537714683ce7d316d70e9c2a 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Zig uses: goto-bus-stop/setup-zig@v1 with: - version: "0.11.0-dev.193+eed82ca28" + version: "0.11.0-dev.874+40ed6ae84" - run: zig version - run: zig env diff --git a/README.md b/README.md index b57b8bce42f9cef706959483a6b9dc2d4dbb1ff1..d3d837812c151c14a5e36d67ca72aac1d7db3af6 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ A package manager for the Zig programming language. - https://github.com/nektro/zigmod/releases ## Built With -- Zig master (at least `0.11.0-dev.193+eed82ca28`) +- Zig master (at least `0.11.0-dev.874+40ed6ae84`) - See [`zig.mod`](./zig.mod) and [`zigmod.lock`](./zigmod.lock) ### Build from Source diff --git a/deps.zig b/deps.zig index 5371903e09f887803761f4995cdbb42a44c41334..690d48f96fd96d4e544cb2ecf8d1695ac8bfc8e3 100644 --- a/deps.zig +++ b/deps.zig @@ -48,24 +48,24 @@ pub fn fetch(exe: *std.build.LibExeObjStep) void { const root = if (@field(package_data, decl.name).store) |_| b.cache_root else "."; if (path.* != null) path.* = b.fmt("{s}/zigmod/deps{s}", .{ root, path.*.? }); } - exe.step.dependOn(&GitExactStep.create(b, "https://gist.github.com/nektro/d468fea84f8217e4c26ee8fbeeea38cc", "24c01e844396d18a90bbbfb91f8a5a12023e9379").step); - exe.step.dependOn(&GitExactStep.create(b, "https://github.com/MasterQ32/zig-uri", "b7e688fc019e33f900fba0940eab74c81b480c13").step); - exe.step.dependOn(&GitExactStep.create(b, "https://github.com/marlersoft/zigwin32", "209f07cc5861c7bd9c3010a37f32bf6244f9a158").step); - exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/arqv-ini", "1a9b2e90379895e197893b6e19c93bd213ad36e6").step); - exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/iguanaTLS", "5ad811124d46018df53bbff6e90a37097a8f170c").step); + exe.step.dependOn(&GitExactStep.create(b, "https://gist.github.com/nektro/d468fea84f8217e4c26ee8fbeeea38cc", "00f00febc5ad7c485fb101583d5a74930f6ac313").step); + exe.step.dependOn(&GitExactStep.create(b, "https://github.com/MasterQ32/zig-uri", "d4299ad6043ad19f2ce0676687b0bff57273eae2").step); + exe.step.dependOn(&GitExactStep.create(b, "https://github.com/marlersoft/zigwin32", "56cf335ddcdb72a6d7059c5b6f131263830b3eca").step); + exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/arqv-ini", "ee395fd34e152d9067def609d86b7af5382b83b1").step); + exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/iguanaTLS", "5dee3ead2b289319080834add91b5f35dfdb1847").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-ansi", "8d6fdb4983a616940c1d5137110292a7862f6a7e").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-detect-license", "de5c285d999eea68b9189b48bb000243fef0a689").step); - exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-extras", "01fae956e2f17aa992e717e041a3dd457d440b31").step); + exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-extras", "b45c99e2e747e3bb8df5e1051078cacb1470a430").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-inquirer", "25e35a46400cfa1d7278436c0b7d14d314889d7c").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-json", "0e7d026b0d3889ed7f96e1b24566a66cd9df6cb3").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-leven", "ab852cf74fa0b4edc530d925f0654b62c60365bf").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-licenses", "c9b8cbf3565675a056ad4e9b57cb4f84020e7680").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-licenses-text", "3c07c6e4eb0965dafd0b029c632f823631b3169c").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-range", "4b2f12808aa09be4b27a163efc424dd4e0415992").step); - exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-time", "52a6050939b83e9f8b52b2236a36332dcb4c17a3").step); - exe.step.dependOn(&GitExactStep.create(b, "https://github.com/truemedian/hzzp", "d4fbade2d806fc93bc5f79ec8efdcc25ea625fa3").step); + exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-time", "aff2df866eb16ad781e26a25f8b664d498e2211a").step); + exe.step.dependOn(&GitExactStep.create(b, "https://github.com/truemedian/hzzp", "2d2ab34b666e6806a6f6c98cc50ca94e606c9103").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/truemedian/zfetch", "829973144f680cd16be16923041fa810c1dee417").step); - exe.step.dependOn(&GitExactStep.create(b, "https://github.com/ziglibs/known-folders", "24845b0103e611c108d6bc334231c464e699742c").step); + exe.step.dependOn(&GitExactStep.create(b, "https://github.com/ziglibs/known-folders", "6b37490ac7285133bf09441850b8102c9728a776").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/yaml/libyaml", "2c891fc7a770e8ba2fec34fc6b545c672beb37e6").step); } @@ -143,30 +143,30 @@ pub const Package = struct { }; fn checkMinZig(current: std.SemanticVersion, exe: *std.build.LibExeObjStep) void { - const min = std.SemanticVersion.parse("0.11.0-dev.193+eed82ca28") catch return; + const min = std.SemanticVersion.parse("0.11.0-dev.874+40ed6ae84") catch return; if (current.order(min).compare(.lt)) @panic(exe.builder.fmt("Your Zig version v{} does not meet the minimum build requirement of v{}", .{current, min})); } pub const package_data = struct { pub var _u9w9dpp6p804 = Package{ - .store = "/git/github.com/MasterQ32/zig-uri/b7e688fc019e33f900fba0940eab74c81b480c13", + .store = "/git/github.com/MasterQ32/zig-uri/d4299ad6043ad19f2ce0676687b0bff57273eae2", .name = "uri", - .entry = "/git/github.com/MasterQ32/zig-uri/b7e688fc019e33f900fba0940eab74c81b480c13/uri.zig", + .entry = "/git/github.com/MasterQ32/zig-uri/d4299ad6043ad19f2ce0676687b0bff57273eae2/uri.zig", }; pub var _o6ogpor87xc2 = Package{ - .store = "/git/github.com/marlersoft/zigwin32/209f07cc5861c7bd9c3010a37f32bf6244f9a158", + .store = "/git/github.com/marlersoft/zigwin32/56cf335ddcdb72a6d7059c5b6f131263830b3eca", .name = "win32", - .entry = "/git/github.com/marlersoft/zigwin32/209f07cc5861c7bd9c3010a37f32bf6244f9a158/win32.zig", + .entry = "/git/github.com/marlersoft/zigwin32/56cf335ddcdb72a6d7059c5b6f131263830b3eca/win32.zig", }; pub var _u7sysdckdymi = Package{ - .store = "/git/github.com/nektro/arqv-ini/1a9b2e90379895e197893b6e19c93bd213ad36e6", + .store = "/git/github.com/nektro/arqv-ini/ee395fd34e152d9067def609d86b7af5382b83b1", .name = "ini", - .entry = "/git/github.com/nektro/arqv-ini/1a9b2e90379895e197893b6e19c93bd213ad36e6/src/ini.zig", + .entry = "/git/github.com/nektro/arqv-ini/ee395fd34e152d9067def609d86b7af5382b83b1/src/ini.zig", }; pub var _csbnipaad8n7 = Package{ - .store = "/git/github.com/nektro/iguanaTLS/5ad811124d46018df53bbff6e90a37097a8f170c", + .store = "/git/github.com/nektro/iguanaTLS/5dee3ead2b289319080834add91b5f35dfdb1847", .name = "iguanaTLS", - .entry = "/git/github.com/nektro/iguanaTLS/5ad811124d46018df53bbff6e90a37097a8f170c/src/main.zig", + .entry = "/git/github.com/nektro/iguanaTLS/5dee3ead2b289319080834add91b5f35dfdb1847/src/main.zig", }; pub var _s84v9o48ucb0 = Package{ .store = "/git/github.com/nektro/zig-ansi/8d6fdb4983a616940c1d5137110292a7862f6a7e", @@ -189,15 +189,15 @@ pub const package_data = struct { .entry = "/git/github.com/nektro/zig-range/4b2f12808aa09be4b27a163efc424dd4e0415992/src/lib.zig", }; pub var _f7dubzb7cyqe = Package{ - .store = "/git/github.com/nektro/zig-extras/01fae956e2f17aa992e717e041a3dd457d440b31", + .store = "/git/github.com/nektro/zig-extras/b45c99e2e747e3bb8df5e1051078cacb1470a430", .name = "extras", - .entry = "/git/github.com/nektro/zig-extras/01fae956e2f17aa992e717e041a3dd457d440b31/src/lib.zig", + .entry = "/git/github.com/nektro/zig-extras/b45c99e2e747e3bb8df5e1051078cacb1470a430/src/lib.zig", .deps = &[_]*Package{ &_tnj3qf44tpeq }, }; pub var _g982zq6e8wsv = Package{ - .store = "/git/gist.github.com/nektro/d468fea84f8217e4c26ee8fbeeea38cc/24c01e844396d18a90bbbfb91f8a5a12023e9379", + .store = "/git/gist.github.com/nektro/d468fea84f8217e4c26ee8fbeeea38cc/00f00febc5ad7c485fb101583d5a74930f6ac313", .name = "yaml", - .entry = "/git/gist.github.com/nektro/d468fea84f8217e4c26ee8fbeeea38cc/24c01e844396d18a90bbbfb91f8a5a12023e9379/yaml.zig", + .entry = "/git/gist.github.com/nektro/d468fea84f8217e4c26ee8fbeeea38cc/00f00febc5ad7c485fb101583d5a74930f6ac313/yaml.zig", .deps = &[_]*Package{ &_f7dubzb7cyqe }, }; pub var _c1xirp1ota5p = Package{ @@ -225,15 +225,15 @@ pub const package_data = struct { .deps = &[_]*Package{ &_pt88y5d80m25, &_96h80ezrvj7i }, }; pub var _iecwp4b3bsfm = Package{ - .store = "/git/github.com/nektro/zig-time/52a6050939b83e9f8b52b2236a36332dcb4c17a3", + .store = "/git/github.com/nektro/zig-time/aff2df866eb16ad781e26a25f8b664d498e2211a", .name = "time", - .entry = "/git/github.com/nektro/zig-time/52a6050939b83e9f8b52b2236a36332dcb4c17a3/time.zig", - .deps = &[_]*Package{ &_tnj3qf44tpeq, &_f7dubzb7cyqe }, + .entry = "/git/github.com/nektro/zig-time/aff2df866eb16ad781e26a25f8b664d498e2211a/time.zig", + .deps = &[_]*Package{ &_f7dubzb7cyqe }, }; pub var _9k24gimke1an = Package{ - .store = "/git/github.com/truemedian/hzzp/d4fbade2d806fc93bc5f79ec8efdcc25ea625fa3", + .store = "/git/github.com/truemedian/hzzp/2d2ab34b666e6806a6f6c98cc50ca94e606c9103", .name = "hzzp", - .entry = "/git/github.com/truemedian/hzzp/d4fbade2d806fc93bc5f79ec8efdcc25ea625fa3/src/main.zig", + .entry = "/git/github.com/truemedian/hzzp/2d2ab34b666e6806a6f6c98cc50ca94e606c9103/src/main.zig", }; pub var _ejw82j2ipa0e = Package{ .store = "/git/github.com/truemedian/zfetch/829973144f680cd16be16923041fa810c1dee417", @@ -242,9 +242,9 @@ pub const package_data = struct { .deps = &[_]*Package{ &_9k24gimke1an, &_csbnipaad8n7, &_u9w9dpp6p804 }, }; pub var _2ta738wrqbaq = Package{ - .store = "/git/github.com/ziglibs/known-folders/24845b0103e611c108d6bc334231c464e699742c", + .store = "/git/github.com/ziglibs/known-folders/6b37490ac7285133bf09441850b8102c9728a776", .name = "known-folders", - .entry = "/git/github.com/ziglibs/known-folders/24845b0103e611c108d6bc334231c464e699742c/known-folders.zig", + .entry = "/git/github.com/ziglibs/known-folders/6b37490ac7285133bf09441850b8102c9728a776/known-folders.zig", }; pub var _89ujp8gq842x = Package{ .name = "zigmod", diff --git a/docs/README.md b/docs/README.md index 104ebb0ca6bfe0a6c16f0299f0bef794ec9e963a..80e767ec292c8c09507609cfce1d5cbc0980f3bb 100644 --- a/docs/README.md +++ b/docs/README.md @@ -10,7 +10,7 @@ The rest of this documentation will assume you already have Zig installed. As Zig is still in development itself, if you plan to contribute to Zigmod you will need a master download of Zig. Those can be obtained from https://ziglang.org/download/#release-master. -The earliest Zig release this Zigmod was verified to work with is `0.11.0-dev.193+eed82ca28`. +The earliest Zig release this Zigmod was verified to work with is `0.11.0-dev.874+40ed6ae84`. ## Download You may download a precompiled binary from https://github.com/nektro/zigmod/releases or build the project from source. diff --git a/src/common.zig b/src/common.zig index 40f75090a87e2c79842d2ae78803bcd7ba81a01e..2bc0210f0ca8f86046636e143e44a39aa9c90ee2 100644 --- a/src/common.zig +++ b/src/common.zig @@ -49,7 +49,7 @@ pub fn collect_deps_deep(cachepath: string, mdir: std.fs.Dir, options: *CollectO .id = "root", .name = "root", .main = m.main, - .deps = moduledeps.toOwnedSlice(), + .deps = try moduledeps.toOwnedSlice(), .clean_path = "", .yaml = m.yaml, .dep = null, @@ -80,7 +80,7 @@ pub fn collect_deps(cachepath: string, mdir: std.fs.Dir, dtype: zigmod.Dep.Type, .c_include_dirs = m.c_include_dirs, .c_source_flags = m.c_source_flags, .c_source_files = m.c_source_files, - .deps = moduledeps.toOwnedSlice(), + .deps = try moduledeps.toOwnedSlice(), .clean_path = "../..", .yaml = m.yaml, .dep = null, diff --git a/src/util/module.zig b/src/util/module.zig index 56aa01f8c167e7f6cea1bce176001e588e5189e4..f77696a3f5ad1da9245c8873da2b288f12d35090 100644 --- a/src/util/module.zig +++ b/src/util/module.zig @@ -46,7 +46,7 @@ pub const Module = struct { .c_include_dirs = dep.c_include_dirs, .c_source_flags = dep.c_source_flags, .c_source_files = dep.c_source_files, - .deps = moddeps.toOwnedSlice(), + .deps = try moddeps.toOwnedSlice(), .clean_path = try dep.clean_path(alloc), .only_os = dep.only_os, .except_os = dep.except_os, diff --git a/zig.mod b/zig.mod index 4b53c40774bdd3e1534ebd49a2ddec56a8c2e02e..122a7e5b0dec100331893698a4d8caee6a85f03a 100644 --- a/zig.mod +++ b/zig.mod @@ -3,7 +3,7 @@ name: zigmod main: src/lib.zig license: MIT description: A package manager for the Zig programming language. -min_zig_version: 0.11.0-dev.193+eed82ca28 +min_zig_version: 0.11.0-dev.874+40ed6ae84 dependencies: - src: git https://gist.github.com/nektro/d468fea84f8217e4c26ee8fbeeea38cc # yaml - src: git https://github.com/nektro/zig-ansi -- 2.54.0