diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 47ef3f9e1b1c6111be3b3de12acb288d28f57ad1..ade9ac496dd2a0cb17303562683480183d1dd362 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.10.0-dev.2017+a0a2ce92c" + version: "0.10.0-dev.2412+4e918873e" - run: zig version - run: zig env diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2482c625e648677dc07442097bf46208bffc1562..7748e806839641ebaef46878460eb064a59148ad 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.10.0-dev.2017+a0a2ce92c" + version: "0.10.0-dev.2412+4e918873e" - run: zig version - run: zig env diff --git a/README.md b/README.md index 908a83256bc22722aeb0cbc26c77d4a61fb98637..994ab60a4cecb87ada7f2c73af9418c7b1a76929 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.10.0-dev.2017+a0a2ce92c`) +- Zig master (at least `0.10.0-dev.2412+4e918873e`) - See [`zig.mod`](./zig.mod) and [`zigmod.lock`](./zigmod.lock) ### Build from Source diff --git a/build.zig b/build.zig index 2d325df180f10c4e79d4193231a59493c5500725..5f5020f6b83eef612d2f30ac30c891a16de7b99f 100644 --- a/build.zig +++ b/build.zig @@ -57,9 +57,9 @@ fn makeExe(b: *std.build.Builder, exe_name: string, target: std.zig.CrossTarget, exe.addPackage(.{ .name = "zigmod", - .path = .{ .path = "./src/lib.zig" }, + .source = .{ .path = "./src/lib.zig" }, .dependencies = &[_]std.build.Pkg{ - .{ .name = "zfetch", .path = .{ .path = "src/zfetch_stub.zig" } }, + .{ .name = "zfetch", .source = .{ .path = "src/zfetch_stub.zig" } }, }, }); } else { diff --git a/deps.zig b/deps.zig index 1661ecd5474f2f81f1cdacaa0e1446e641f8e6b4..f37dc7fe0a3157ef197fdca875a0e79eab4891b8 100644 --- a/deps.zig +++ b/deps.zig @@ -50,7 +50,7 @@ pub const Package = struct { }; fn checkMinZig(current: std.SemanticVersion, exe: *std.build.LibExeObjStep) void { - const min = std.SemanticVersion.parse("0.10.0-dev.2017+a0a2ce92c") catch return; + const min = std.SemanticVersion.parse("0.10.0-dev.2412+4e918873e") 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})); } @@ -86,75 +86,75 @@ pub const package_data = struct { }; pub const _s84v9o48ucb0 = Package{ .directory = dirs._s84v9o48ucb0, - .pkg = Pkg{ .name = "ansi", .path = .{ .path = dirs._s84v9o48ucb0 ++ "/src/lib.zig" }, .dependencies = null }, + .pkg = Pkg{ .name = "ansi", .source = .{ .path = dirs._s84v9o48ucb0 ++ "/src/lib.zig" }, .dependencies = null }, }; pub const _2ta738wrqbaq = Package{ .directory = dirs._2ta738wrqbaq, - .pkg = Pkg{ .name = "known-folders", .path = .{ .path = dirs._2ta738wrqbaq ++ "/known-folders.zig" }, .dependencies = null }, + .pkg = Pkg{ .name = "known-folders", .source = .{ .path = dirs._2ta738wrqbaq ++ "/known-folders.zig" }, .dependencies = null }, }; pub const _0npcrzfdlrvk = Package{ .directory = dirs._0npcrzfdlrvk, - .pkg = Pkg{ .name = "licenses", .path = .{ .path = dirs._0npcrzfdlrvk ++ "/src/lib.zig" }, .dependencies = null }, + .pkg = Pkg{ .name = "licenses", .source = .{ .path = dirs._0npcrzfdlrvk ++ "/src/lib.zig" }, .dependencies = null }, }; pub const _9k24gimke1an = Package{ .directory = dirs._9k24gimke1an, - .pkg = Pkg{ .name = "hzzp", .path = .{ .path = dirs._9k24gimke1an ++ "/src/main.zig" }, .dependencies = null }, + .pkg = Pkg{ .name = "hzzp", .source = .{ .path = dirs._9k24gimke1an ++ "/src/main.zig" }, .dependencies = null }, }; pub const _csbnipaad8n7 = Package{ .directory = dirs._csbnipaad8n7, - .pkg = Pkg{ .name = "iguanaTLS", .path = .{ .path = dirs._csbnipaad8n7 ++ "/src/main.zig" }, .dependencies = null }, + .pkg = Pkg{ .name = "iguanaTLS", .source = .{ .path = dirs._csbnipaad8n7 ++ "/src/main.zig" }, .dependencies = null }, }; pub const _u9w9dpp6p804 = Package{ .directory = dirs._u9w9dpp6p804, - .pkg = Pkg{ .name = "uri", .path = .{ .path = dirs._u9w9dpp6p804 ++ "/uri.zig" }, .dependencies = null }, + .pkg = Pkg{ .name = "uri", .source = .{ .path = dirs._u9w9dpp6p804 ++ "/uri.zig" }, .dependencies = null }, }; pub const _ejw82j2ipa0e = Package{ .directory = dirs._ejw82j2ipa0e, - .pkg = Pkg{ .name = "zfetch", .path = .{ .path = dirs._ejw82j2ipa0e ++ "/src/main.zig" }, .dependencies = &.{ _9k24gimke1an.pkg.?, _csbnipaad8n7.pkg.?, _u9w9dpp6p804.pkg.? } }, + .pkg = Pkg{ .name = "zfetch", .source = .{ .path = dirs._ejw82j2ipa0e ++ "/src/main.zig" }, .dependencies = &.{ _9k24gimke1an.pkg.?, _csbnipaad8n7.pkg.?, _u9w9dpp6p804.pkg.? } }, }; pub const _tnj3qf44tpeq = Package{ .directory = dirs._tnj3qf44tpeq, - .pkg = Pkg{ .name = "range", .path = .{ .path = dirs._tnj3qf44tpeq ++ "/src/lib.zig" }, .dependencies = null }, + .pkg = Pkg{ .name = "range", .source = .{ .path = dirs._tnj3qf44tpeq ++ "/src/lib.zig" }, .dependencies = null }, }; pub const _f7dubzb7cyqe = Package{ .directory = dirs._f7dubzb7cyqe, - .pkg = Pkg{ .name = "extras", .path = .{ .path = dirs._f7dubzb7cyqe ++ "/src/lib.zig" }, .dependencies = &.{ _tnj3qf44tpeq.pkg.? } }, + .pkg = Pkg{ .name = "extras", .source = .{ .path = dirs._f7dubzb7cyqe ++ "/src/lib.zig" }, .dependencies = &.{ _tnj3qf44tpeq.pkg.? } }, }; pub const _ocmr9rtohgcc = Package{ .directory = dirs._ocmr9rtohgcc, - .pkg = Pkg{ .name = "json", .path = .{ .path = dirs._ocmr9rtohgcc ++ "/src/lib.zig" }, .dependencies = &.{ _f7dubzb7cyqe.pkg.? } }, + .pkg = Pkg{ .name = "json", .source = .{ .path = dirs._ocmr9rtohgcc ++ "/src/lib.zig" }, .dependencies = &.{ _f7dubzb7cyqe.pkg.? } }, }; pub const _pt88y5d80m25 = Package{ .directory = dirs._pt88y5d80m25, - .pkg = Pkg{ .name = "licenses-text", .path = .{ .path = dirs._pt88y5d80m25 ++ "/src/lib.zig" }, .dependencies = null }, + .pkg = Pkg{ .name = "licenses-text", .source = .{ .path = dirs._pt88y5d80m25 ++ "/src/lib.zig" }, .dependencies = null }, }; pub const _96h80ezrvj7i = Package{ .directory = dirs._96h80ezrvj7i, - .pkg = Pkg{ .name = "leven", .path = .{ .path = dirs._96h80ezrvj7i ++ "/src/lib.zig" }, .dependencies = &.{ _tnj3qf44tpeq.pkg.? } }, + .pkg = Pkg{ .name = "leven", .source = .{ .path = dirs._96h80ezrvj7i ++ "/src/lib.zig" }, .dependencies = &.{ _tnj3qf44tpeq.pkg.? } }, }; pub const _2ovav391ivak = Package{ .directory = dirs._2ovav391ivak, - .pkg = Pkg{ .name = "detect-license", .path = .{ .path = dirs._2ovav391ivak ++ "/src/lib.zig" }, .dependencies = &.{ _pt88y5d80m25.pkg.?, _96h80ezrvj7i.pkg.? } }, + .pkg = Pkg{ .name = "detect-license", .source = .{ .path = dirs._2ovav391ivak ++ "/src/lib.zig" }, .dependencies = &.{ _pt88y5d80m25.pkg.?, _96h80ezrvj7i.pkg.? } }, }; pub const _c1xirp1ota5p = Package{ .directory = dirs._c1xirp1ota5p, - .pkg = Pkg{ .name = "inquirer", .path = .{ .path = dirs._c1xirp1ota5p ++ "/src/lib.zig" }, .dependencies = &.{ _s84v9o48ucb0.pkg.?, _tnj3qf44tpeq.pkg.? } }, + .pkg = Pkg{ .name = "inquirer", .source = .{ .path = dirs._c1xirp1ota5p ++ "/src/lib.zig" }, .dependencies = &.{ _s84v9o48ucb0.pkg.?, _tnj3qf44tpeq.pkg.? } }, }; pub const _u7sysdckdymi = Package{ .directory = dirs._u7sysdckdymi, - .pkg = Pkg{ .name = "ini", .path = .{ .path = dirs._u7sysdckdymi ++ "/src/ini.zig" }, .dependencies = null }, + .pkg = Pkg{ .name = "ini", .source = .{ .path = dirs._u7sysdckdymi ++ "/src/ini.zig" }, .dependencies = null }, }; pub const _iecwp4b3bsfm = Package{ .directory = dirs._iecwp4b3bsfm, - .pkg = Pkg{ .name = "time", .path = .{ .path = dirs._iecwp4b3bsfm ++ "/time.zig" }, .dependencies = &.{ _tnj3qf44tpeq.pkg.?, _f7dubzb7cyqe.pkg.? } }, + .pkg = Pkg{ .name = "time", .source = .{ .path = dirs._iecwp4b3bsfm ++ "/time.zig" }, .dependencies = &.{ _tnj3qf44tpeq.pkg.?, _f7dubzb7cyqe.pkg.? } }, }; pub const _89ujp8gq842x = Package{ .directory = dirs._89ujp8gq842x, - .pkg = Pkg{ .name = "zigmod", .path = .{ .path = dirs._89ujp8gq842x ++ "/src/lib.zig" }, .dependencies = &.{ _s84v9o48ucb0.pkg.?, _2ta738wrqbaq.pkg.?, _0npcrzfdlrvk.pkg.?, _ejw82j2ipa0e.pkg.?, _ocmr9rtohgcc.pkg.?, _tnj3qf44tpeq.pkg.?, _2ovav391ivak.pkg.?, _c1xirp1ota5p.pkg.?, _u7sysdckdymi.pkg.?, _iecwp4b3bsfm.pkg.? } }, + .pkg = Pkg{ .name = "zigmod", .source = .{ .path = dirs._89ujp8gq842x ++ "/src/lib.zig" }, .dependencies = &.{ _s84v9o48ucb0.pkg.?, _2ta738wrqbaq.pkg.?, _0npcrzfdlrvk.pkg.?, _ejw82j2ipa0e.pkg.?, _ocmr9rtohgcc.pkg.?, _tnj3qf44tpeq.pkg.?, _2ovav391ivak.pkg.?, _c1xirp1ota5p.pkg.?, _u7sysdckdymi.pkg.?, _iecwp4b3bsfm.pkg.? } }, }; pub const _o6ogpor87xc2 = Package{ .directory = dirs._o6ogpor87xc2, - .pkg = Pkg{ .name = "win32", .path = .{ .path = dirs._o6ogpor87xc2 ++ "/win32.zig" }, .dependencies = null }, + .pkg = Pkg{ .name = "win32", .source = .{ .path = dirs._o6ogpor87xc2 ++ "/win32.zig" }, .dependencies = null }, }; pub const _root = Package{ .directory = dirs._root, diff --git a/docs/README.md b/docs/README.md index cc2eb72e9af88d1e9722b54748b0c4e052c1624b..7c8243ff5c7586f7c923b9d0045e28e93cdbe980 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.10.0-dev.2017+a0a2ce92c`. +The earliest Zig release this Zigmod was verified to work with is `0.10.0-dev.2412+4e918873e`. ## 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/fetch.zig b/src/cmd/fetch.zig index 76af0d9eab97f00deba62657fc55449cd1845a8a..b8e98fa71032ed225b17837ce0c5a7e4f0b7ab2a 100644 --- a/src/cmd/fetch.zig +++ b/src/cmd/fetch.zig @@ -284,7 +284,7 @@ fn print_pkg_data_to(w: std.fs.File.Writer, notdone: *std.ArrayList(zigmod.Modul }); if (mod.main.len > 0 and !std.mem.eql(u8, mod.id, "root")) { try w.print( - \\ .pkg = Pkg{{ .name = "{s}", .path = .{{ .path = dirs._{s} ++ "/{s}" }}, .dependencies = + \\ .pkg = Pkg{{ .name = "{s}", .source = .{{ .path = dirs._{s} ++ "/{s}" }}, .dependencies = , .{ mod.name, mod.short_id(), diff --git a/zig.mod b/zig.mod index d6370bfef30ceff473fc014d280eecb558e5d213..f3e63aaa87c6fc0ea2f90a5b9db9f6e1d8c9ccc0 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.10.0-dev.2017+a0a2ce92c +min_zig_version: 0.10.0-dev.2412+4e918873e dependencies: - src: git https://github.com/yaml/libyaml tag-0.2.5 id: 8mdbh0zuneb0i3hs5jby5je0heem1i6yxusl7c8y8qx68hqc