From cc3b15c92797ce6f9e7bf3d7bf4aff1559b3e48a Mon Sep 17 00:00:00 2001 From: Luna Date: Tue, 15 Jun 2021 16:56:06 -0300 Subject: [PATCH 1/2] cmd/fetch- use FileSource --- src/cmd/fetch.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig index 077838289c2fc258e1d6f2ef890b89e6fbfcdad9..6747721af127517811b66c31424b9cf7b886062d 100644 --- a/src/cmd/fetch.zig +++ b/src/cmd/fetch.zig @@ -220,7 +220,7 @@ fn print_pkg_data_to(w: std.fs.File.Writer, notdone: *std.ArrayList(u.Module), d while (notdone.items.len > 0) { for (notdone.items) |mod, i| { if (contains_all(mod.deps, done.items)) { - try w.print(" pub const _{s} = std.build.Pkg{{ .name = \"{s}\", .path = cache ++ \"/{}/{s}\", .dependencies = &[_]std.build.Pkg{{", .{ mod.id[0..12], mod.name, std.zig.fmtEscapes(mod.clean_path), mod.main }); + try w.print(" pub const _{s} = std.build.Pkg{{ .name = \"{s}\", .path = std.build.FileSource{{ .path = cache ++ \"/{}/{s}\" }}, .dependencies = &[_]std.build.Pkg{{", .{ mod.id[0..12], mod.name, std.zig.fmtEscapes(mod.clean_path), mod.main }); for (mod.deps) |d| { if (d.main.len > 0) { try w.print(" _{s},", .{d.id[0..12]}); -- 2.54.0 From 3551b51ec3b81a4351cc5814566b9d3ddd92954d Mon Sep 17 00:00:00 2001 From: Luna Date: Wed, 16 Jun 2021 16:56:58 -0300 Subject: [PATCH 2/2] bump to zig 0.9.0-dev.133+ff79b87fa --- .circleci/config.yml | 2 +- README.md | 2 +- docs/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1a5da540ee8cdad966803ca0528aed02226e6453..42e2d709c175807ea25c68f5a69cab8120365ba1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ jobs: - run: git submodule update --init --recursive - run: apt -y install xz-utils jq - - run: ./download_zig.sh 0.8.0 + - run: ./download_zig.sh 0.9.0-dev.133+ff79b87fa - run: zig version - run: zig env - run: zig build -Dbootstrap diff --git a/README.md b/README.md index dd318c382154b688a626244a8b26f3d224a1cdb5..d8ea37537c2e0b6ea2f382bc1ee4d85117fb6a75 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 `0.8.0` +- Zig master `0.9.0-dev.133+ff79b87fa` ### Build from Source Initially, diff --git a/docs/README.md b/docs/README.md index 650748791328806bac55b0f38e72946f6d2886b4..3512f7a5c40c9fe16109d9b1340cc06a44b80d89 100644 --- a/docs/README.md +++ b/docs/README.md @@ -8,7 +8,7 @@ You can learn more about Zig here: 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 most recent release Zigmod was verified to work with is `0.8.0`. +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 most recent release Zigmod was verified to work with is `0.9.0-dev.133+ff79b87fa`. ## Download You may download a precompiled binary from https://github.com/nektro/zigmod/releases or build the project from source. -- 2.54.0