diff --git a/.circleci/config.yml b/.circleci/config.yml index ff36864f21a1d308253055c528c363b1bba30f93..4dd68e5c9730e2f3657eb0032dc86e506e0a5498 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.9.0-dev.946+6237dc0ab + - run: ./download_zig.sh 0.9.0-dev.1343+75cecef63 - run: zig version - run: zig env - run: zig build -Dbootstrap diff --git a/README.md b/README.md index 9860ec36197300b3dc6569f2757e3c7b20d55d39..3e88f591e38f9a36dc8c095dcf65909180eac9f7 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.9.0-dev.946+6237dc0ab` +- Zig master `0.9.0-dev.1343+75cecef63` - https://github.com/yaml/libyaml - https://github.com/nektro/zig-ansi - https://github.com/ziglibs/known-folders diff --git a/build.zig b/build.zig index f89a214c37f0e3b6413c5c7a53b43f120a5274f0..7484cf2ac466d2a8e7e9afe3c36cb6fcb976dbe5 100644 --- a/build.zig +++ b/build.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const builtin = std.builtin; +const builtin = @import("builtin"); const deps = @import("./deps.zig"); pub fn build(b: *std.build.Builder) void { diff --git a/docs/README.md b/docs/README.md index 6bcb069fe5fdf1609354a2e8ce26f11e6efe58c1..2123298a13661af29f4c09283998f0baad6535e1 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 most recent release Zigmod was verified to work with is `0.9.0-dev.946+6237dc0ab`. +The most recent release Zigmod was verified to work with is `0.9.0-dev.1343+75cecef63`. ## Download You may download a precompiled binary from https://github.com/nektro/zigmod/releases or build the project from source. diff --git a/src/cmd/version.zig b/src/cmd/version.zig index d84ac1b288dba878ee40375e3fd38fc3f67d494e..c96ee98fd6f7629da5a49c646cb301f56148ff25 100644 --- a/src/cmd/version.zig +++ b/src/cmd/version.zig @@ -1,6 +1,6 @@ const std = @import("std"); const gpa = std.heap.c_allocator; -const builtin = std.builtin; +const builtin = @import("builtin"); const u = @import("./../util/index.zig"); diff --git a/src/common.zig b/src/common.zig index 976bed3cbe63bd61e155651783f3bf06b3bd70b4..1581daf4a352e981b1b6b32bc65ba087f38481fc 100644 --- a/src/common.zig +++ b/src/common.zig @@ -1,4 +1,5 @@ const std = @import("std"); +const builtin = @import("builtin"); const gpa = std.heap.c_allocator; const ansi = @import("ansi"); @@ -142,7 +143,7 @@ pub fn get_modpath(cachepath: []const u8, d: u.Dep, options: *CollectOptions) ![ if ((try u.run_cmd(pv, &.{ "git", "checkout", vers.string })) > 0) { u.assert(false, "fetch: git: {s}: {s} {s} does not exist", .{ d.path, @tagName(vers.id), vers.string }); } - if (std.builtin.os.tag != .windows and vers.id != .branch) { + if (builtin.os.tag != .windows and vers.id != .branch) { const pvd = try std.fs.cwd().openDir(pv, .{}); try pvd.deleteTree(".git"); } diff --git a/src/main.zig b/src/main.zig index 1a1a6872aa0eda96135f084818cc4bb614727172..16d548b123d718f7fe6317b784123edbd980e5a6 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const builtin = std.builtin; +const builtin = @import("builtin"); pub const build_options = @import("build_options"); const zigmod = @import("zigmod"); diff --git a/src/util/module.zig b/src/util/module.zig index 26e070829e1771d3a9fcf0432e041dcfc37f077a..c2fb89f5f1a25c6750c92808725a1006c2fbae54 100644 --- a/src/util/module.zig +++ b/src/util/module.zig @@ -1,6 +1,6 @@ const std = @import("std"); const gpa = std.heap.c_allocator; -const builtin = std.builtin; +const builtin = @import("builtin"); const u = @import("index.zig"); const yaml = @import("./yaml.zig"); diff --git a/zigmod.lock b/zigmod.lock index 63590579fb3be2cfa6b0aa0ba1bb90f77ac8e65d..ba501ec04754e07b07bead936d09c2e0e8c9fc7a 100644 --- a/zigmod.lock +++ b/zigmod.lock @@ -1,12 +1,12 @@ 2 git https://github.com/yaml/libyaml tag-0.2.5 -git https://github.com/nektro/iguanaTLS commit-953ad821fae6c920fb82399493663668cd91bde7 +git https://github.com/nektro/iguanaTLS commit-954fd016964d44dfe8648985fd7c06f0067be6b0 git https://github.com/nektro/zig-ansi commit-d4a53bcac5b87abecc65491109ec22aaf5f3dc2f -git https://github.com/ziglibs/known-folders commit-234b589d3cd0c00f2f675f98fd9674e208fd2bd0 +git https://github.com/ziglibs/known-folders commit-a282c26da51e5d2c01fec5c744e321ae248cf409 git https://github.com/nektro/zig-licenses commit-c9b8cbf3565675a056ad4e9b57cb4f84020e7680 -git https://github.com/truemedian/zfetch commit-e65c50fb924701d51fd83826b28948c957aad13e +git https://github.com/truemedian/zfetch commit-242a9d88d2baba40e23ba35b15aabe1e34b22110 git https://github.com/truemedian/hzzp commit-417eb13fefb05835c0534e622b5a6e2dc2fcd3d7 -git https://github.com/MasterQ32/zig-network commit-9fa47b74f4d66f6e136d8e35bcf30bc5e6c45025 +git https://github.com/MasterQ32/zig-network commit-0439bd7127ecb8f927a5cecb0beeb1569db2fb95 git https://github.com/MasterQ32/zig-uri commit-52cdd2061bec0579519f0d30280597f3a1db8b75 git https://github.com/nektro/zig-json commit-41a4656180a7a460598a53061c07adfbf174c1f4 git https://github.com/nektro/zig-range commit-890ca308fe09b3d5c866d5cfb3b3d7a95dbf939f @@ -16,4 +16,4 @@ git https://github.com/nektro/zig-leven commit-8e9f827117ab1418578b692a2325754cc git https://github.com/nektro/zig-fs-check commit-dcd8da90fcb8bf3c9887e713bf0ec072bc897dd5 git https://github.com/nektro/zig-inquirer commit-9a068122c59ac2785f330c37bf4412aed644ed37 git https://github.com/arqv/ini commit-4b215c2c41cfb0156873bdb0e074b84f5308de4e -git https://github.com/marlersoft/zigwin32 commit-05b6a1b82abcc3358ee53275f5bd10b71c8f6a94 +git https://github.com/marlersoft/zigwin32 commit-74942bfb350f38f18b39db47c97c1274f6c418b4