Skip to content

Commit a1da62b

Browse files
CloudefCloudef
committed
update zig
1 parent 64b73af commit a1da62b

File tree

4 files changed

+53
-48
lines changed

4 files changed

+53
-48
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ https://ziglang.org/
1010

1111
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
1212

13-
* Zig master: `0.15.0-dev.34+8e0a4ca4b @ 2025-03-10`
13+
* Zig master: `0.15.0-dev.63+aa3db7cc1 @ 2025-03-16`
1414
* Zig latest: `0.14.0 @ 2025-03-05`
1515

1616
## Examples

‎src/zig/versions.nix

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,93 +9,93 @@ let
99
src = release: zigSrc { inherit zigHook release; };
1010

1111
meta-master = {
12-
version = "0.15.0-dev.34+8e0a4ca4b";
13-
date = "2025-03-10";
12+
version = "0.15.0-dev.63+aa3db7cc1";
13+
date = "2025-03-16";
1414
docs = "https://ziglang.org/documentation/master/";
1515
stdDocs = "https://ziglang.org/documentation/master/std/";
1616

1717
src = {
18-
tarball = "https://ziglang.org/builds/zig-0.15.0-dev.34+8e0a4ca4b.tar.xz";
19-
shasum = "00ad4425c0051bfd958650a1fe0373e44efaad862bf7089eb8831fd2356604e3";
20-
size = 17770680;
18+
tarball = "https://ziglang.org/builds/zig-0.15.0-dev.63+aa3db7cc1.tar.xz";
19+
shasum = "08e9312a91bb6b993be9882354fa2073cc6d6fd429430837f5a1cac806e0f76f";
20+
size = 17776616;
2121
};
2222

2323
bootstrap = {
24-
tarball = "https://ziglang.org/builds/zig-bootstrap-0.15.0-dev.34+8e0a4ca4b.tar.xz";
25-
shasum = "2f6ee961e5008e4b9a6a605f416c4023b2ac15f5032d6a8fb650497c2c2f1f55";
26-
size = 48036824;
24+
tarball = "https://ziglang.org/builds/zig-bootstrap-0.15.0-dev.63+aa3db7cc1.tar.xz";
25+
shasum = "1b69d9b90c69ee6276c2e5d65a0337885376e44605fd87c6b07659c27d2a5860";
26+
size = 48039612;
2727
};
2828

2929
x86_64-darwin = {
30-
tarball = "https://ziglang.org/builds/zig-macos-x86_64-0.15.0-dev.34+8e0a4ca4b.tar.xz";
31-
shasum = "200811acea1162cd1380735148e745d851880fff32868e9a042403c57b214f1c";
32-
size = 51037328;
30+
tarball = "https://ziglang.org/builds/zig-macos-x86_64-0.15.0-dev.63+aa3db7cc1.tar.xz";
31+
shasum = "f27298c809230db40efe2948b3eebd23bc01d2183845105dc9ac7eee6dd39d54";
32+
size = 51073624;
3333
};
3434

3535
aarch64-darwin = {
36-
tarball = "https://ziglang.org/builds/zig-macos-aarch64-0.15.0-dev.34+8e0a4ca4b.tar.xz";
37-
shasum = "775b95b45e8c47188d0b51e81fa7db045fd54cf9da1ec04e6257a677883286de";
38-
size = 45905096;
36+
tarball = "https://ziglang.org/builds/zig-macos-aarch64-0.15.0-dev.63+aa3db7cc1.tar.xz";
37+
shasum = "4fc59c67aca0cb60bca43ae667d4124fe6ae3df9c4a33ba4593116e3f89bc2ca";
38+
size = 45921216;
3939
};
4040

4141
x86_64-linux = {
42-
tarball = "https://ziglang.org/builds/zig-linux-x86_64-0.15.0-dev.34+8e0a4ca4b.tar.xz";
43-
shasum = "9eab7719e55309a2288cbc14ea0b0c41b14f9a2b09223ee93071972271a3143e";
44-
size = 49095836;
42+
tarball = "https://ziglang.org/builds/zig-linux-x86_64-0.15.0-dev.63+aa3db7cc1.tar.xz";
43+
shasum = "1a89e6f49868c614d19af27174ac0b6355589599ed9c6754510ea1bcfb0ae4db";
44+
size = 49112720;
4545
};
4646

4747
aarch64-linux = {
48-
tarball = "https://ziglang.org/builds/zig-linux-aarch64-0.15.0-dev.34+8e0a4ca4b.tar.xz";
49-
shasum = "db083c2959f21308095d8c22ad5b6290d214b69e484856d3f939a0a7ecb12d67";
50-
size = 44939212;
48+
tarball = "https://ziglang.org/builds/zig-linux-aarch64-0.15.0-dev.63+aa3db7cc1.tar.xz";
49+
shasum = "916f732c7df86e6a9479bc03e751121e547a006362bde526f6cfb58bae26ea2f";
50+
size = 44954956;
5151
};
5252

5353
armv7l-linux = {
54-
tarball = "https://ziglang.org/builds/zig-linux-armv7a-0.15.0-dev.34+8e0a4ca4b.tar.xz";
55-
shasum = "7df83eae08f6fdeeb7dfe383073d9286f41fd96e1c8a6cd2061f44e257e0cb35";
56-
size = 46123132;
54+
tarball = "https://ziglang.org/builds/zig-linux-armv7a-0.15.0-dev.63+aa3db7cc1.tar.xz";
55+
shasum = "44f8dce4bf9498d79b37f236a0491ba0d628a22d8dc2a9475d106015ff799603";
56+
size = 46134984;
5757
};
5858

5959
riscv64-linux = {
60-
tarball = "https://ziglang.org/builds/zig-linux-riscv64-0.15.0-dev.34+8e0a4ca4b.tar.xz";
61-
shasum = "5d20a158a382c8c1cfc4ecc9f265f38bd3ca76bcbe7a5e7f0cac8976b5619ed5";
62-
size = 48079324;
60+
tarball = "https://ziglang.org/builds/zig-linux-riscv64-0.15.0-dev.63+aa3db7cc1.tar.xz";
61+
shasum = "56eb5b97eebd573e0d5964b5d1def17d33657f80d62239e6fb771cf08d9e2295";
62+
size = 48096204;
6363
};
6464

6565
powerpc64le-linux = {
66-
tarball = "https://ziglang.org/builds/zig-linux-powerpc64le-0.15.0-dev.34+8e0a4ca4b.tar.xz";
67-
shasum = "914b769e18af91e816629709312ff8a721be5afb4f73dc2d1e2980a5a11d10d1";
68-
size = 48712364;
66+
tarball = "https://ziglang.org/builds/zig-linux-powerpc64le-0.15.0-dev.63+aa3db7cc1.tar.xz";
67+
shasum = "dc2416307699edb60829bd9c9f037b0a9ba627cb3c1e38c8523106258c3b92f9";
68+
size = 48738252;
6969
};
7070

7171
i686-linux = {
72-
tarball = "https://ziglang.org/builds/zig-linux-x86-0.15.0-dev.34+8e0a4ca4b.tar.xz";
73-
shasum = "6d1aa30c8dc49af573301e1f28bae1721bcbace2735e6168e04dadcecc47d13e";
74-
size = 51622148;
72+
tarball = "https://ziglang.org/builds/zig-linux-x86-0.15.0-dev.63+aa3db7cc1.tar.xz";
73+
shasum = "fe6da0aa1463821f6e7592f8de6c28d60c2428d4ab0639f8b2a6ef5205e8dc5a";
74+
size = 51625848;
7575
};
7676

7777
loongarch64-linux = {
78-
tarball = "https://ziglang.org/builds/zig-linux-loongarch64-0.15.0-dev.34+8e0a4ca4b.tar.xz";
79-
shasum = "df719f4b72d7cb3021ebe045436c7f1f0ddff9be0c2a984995006718d0bf8af7";
80-
size = 45842124;
78+
tarball = "https://ziglang.org/builds/zig-linux-loongarch64-0.15.0-dev.63+aa3db7cc1.tar.xz";
79+
shasum = "9bc12a665a43b6cee9f60cbbe158823ffea02d80c71e016772eadcf5883f0ea8";
80+
size = 45849312;
8181
};
8282

8383
x86_64-mingw32 = {
84-
tarball = "https://ziglang.org/builds/zig-windows-x86_64-0.15.0-dev.34+8e0a4ca4b.zip";
85-
shasum = "cfb2a0bab9503a948fd3d6ea4b1478568f70783ac5404bc7fe119f27b4d7bf5e";
86-
size = 82751112;
84+
tarball = "https://ziglang.org/builds/zig-windows-x86_64-0.15.0-dev.63+aa3db7cc1.zip";
85+
shasum = "c51d0d5f5fbc458f41d0f8059007d7c56d8f7111ec991b6cb643d72a7fae9385";
86+
size = 82778616;
8787
};
8888

8989
aarch64-mingw32 = {
90-
tarball = "https://ziglang.org/builds/zig-windows-aarch64-0.15.0-dev.34+8e0a4ca4b.zip";
91-
shasum = "688c7d9a7700ecbf75e0a274ff4331e4cbe40644dc7274280f0c41968dc18d84";
92-
size = 78644956;
90+
tarball = "https://ziglang.org/builds/zig-windows-aarch64-0.15.0-dev.63+aa3db7cc1.zip";
91+
shasum = "e1516739215ede9cacbadaf341e59c0afff846573a24e434994b5e65de792c9d";
92+
size = 78670058;
9393
};
9494

9595
i686-mingw32 = {
96-
tarball = "https://ziglang.org/builds/zig-windows-x86-0.15.0-dev.34+8e0a4ca4b.zip";
97-
shasum = "c2bf57fb54fb3e7cc917ff86932ef020a849120badeea5802988ace8532e5a03";
98-
size = 84499180;
96+
tarball = "https://ziglang.org/builds/zig-windows-x86-0.15.0-dev.63+aa3db7cc1.zip";
97+
shasum = "7c1d894c6078129db8ad6e5677b4cc1cba462bdad7392fbb8a9f5ade88a1d774";
98+
size = 84520009;
9999
};
100100
};
101101

‎src/zig2nix/src/zon2json.zig

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ fn stringifyFieldName(allocator: std.mem.Allocator, ast: std.zig.Ast, idx: std.z
1414
}
1515

1616
fn stringifyValue(allocator: std.mem.Allocator, ast: std.zig.Ast, idx: std.zig.Ast.Node.Index) !?[]const u8 {
17-
const slice = ast.tokenSlice(ast.nodes.items(.main_token)[idx]);
17+
const ridx = if (@typeInfo(@TypeOf(idx)) == .@"enum") @intFromEnum(idx) else idx;
18+
const slice = ast.tokenSlice(ast.nodes.items(.main_token)[ridx]);
1819
if (Debug) std.log.debug("value: {s}", .{slice});
1920
if (slice[0] == '\'') {
2021
switch (std.zig.parseCharLiteral(slice)) {
@@ -108,7 +109,11 @@ pub fn parse(allocator: std.mem.Allocator, reader: anytype, writer: anytype, err
108109
return error.ParseFailed;
109110
}
110111

111-
try stringify(arena, writer, ast, ast.nodes.items(.data)[0].lhs, false);
112+
if (@hasField(std.zig.Ast.Node.Data, "lhs")) {
113+
try stringify(arena, writer, ast, ast.nodes.items(.data)[0].lhs, false);
114+
} else {
115+
try stringify(arena, writer, ast, ast.nodes.items(.data)[0].node, false);
116+
}
112117
}
113118

114119
pub fn parsePath(allocator: std.mem.Allocator, cwd: std.fs.Dir, path: []const u8, writer: anytype, error_writer: anytype) !void {

‎templates/master/build.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
// Tracks the earliest Zig version that the package considers to be a
3030
// supported use case.
31-
.minimum_zig_version = "0.15.0-dev.34+8e0a4ca4b",
31+
.minimum_zig_version = "0.15.0-dev.63+aa3db7cc1",
3232

3333
// This field is optional.
3434
// Each dependency must either provide a `url` and `hash`, or a `path`.

0 commit comments

Comments
 (0)