Skip to content

Commit e554bed

Browse files
zig_0_9, zig_0_10: remove (NixOS#376540)
2 parents 0475711 + 6c7920c commit e554bed

File tree

8 files changed

+11
-496
lines changed

8 files changed

+11
-496
lines changed

nixos/doc/manual/release-notes/rl-2505.section.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@
237237

238238
- `pnpm` was updated to version 10. If your project is incompatible, you can install the previous version from the package attribute `pnpm_9`.
239239

240+
- `zig_0_9` and `zig_0_10` have been removed, you should upgrade to `zig_0_13` (also available as just `zig`), `zig_0_12` or `zig_0_11` instead.
241+
240242
- `programs.less.lessopen` is now null by default. To restore the previous behaviour, set it to `''|${lib.getExe' pkgs.lesspipe "lesspipe.sh"} %s''`.
241243

242244
- `hardware.pulseaudio` has been renamed to `services.pulseaudio`. The deprecated option names will continue to work, but causes a warning.

pkgs/development/compilers/zig/default.nix

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
11
{
22
lib,
33
callPackage,
4-
llvmPackages_13,
5-
llvmPackages_15,
64
llvmPackages_16,
75
llvmPackages_17,
86
llvmPackages_18,
97
zigVersions ? { },
108
}:
119
let
1210
versions = {
13-
"0.9.1" = {
14-
llvmPackages = llvmPackages_13;
15-
hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k=";
16-
};
17-
"0.10.1" = {
18-
llvmPackages = llvmPackages_15;
19-
hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo=";
20-
};
2111
"0.11.0" = {
2212
llvmPackages = llvmPackages_16;
2313
hash = "sha256-iuU1fzkbJxI+0N1PiLQM013Pd1bzrgqkbIyTxo5gB2I=";

pkgs/development/compilers/zig/generic.nix

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
2828
inherit hash;
2929
};
3030

31-
patches =
32-
args.patches or [ ]
33-
++ lib.optionals (lib.versions.majorMinor finalAttrs.version == "0.9") [
34-
# Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev)
35-
./patches/0.9-read-dynstr-at-rpath-offset.patch
36-
# Fix build on macOS 13 (cherry-picked from 0.10-dev)
37-
./patches/0.9-bump-macos-supported-version.patch
38-
]
39-
++
40-
lib.optional (lib.versions.majorMinor finalAttrs.version == "0.10")
41-
# Backport alignment related panics from zig-master to 0.10.
42-
# Upstream issue: https://github.com/ziglang/zig/issues/14559
43-
./patches/0.10-macho-fixes.patch;
31+
patches = args.patches or [ ];
4432

4533
nativeBuildInputs = [
4634
cmake
@@ -69,7 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
6957

7058
outputs = [
7159
"out"
72-
] ++ lib.optional (lib.versionAtLeast finalAttrs.version "0.10") "doc";
60+
"doc"
61+
];
7362

7463
# strictDeps breaks zig when clang is being used.
7564
# https://github.com/NixOS/nixpkgs/issues/317055#issuecomment-2148438395
@@ -108,28 +97,20 @@ stdenv.mkDerivation (finalAttrs: {
10897
''
10998
stage3/bin/zig build langref
11099
''
111-
else if lib.versionAtLeast finalAttrs.version "0.11" then
100+
else
112101
''
113102
stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig
114-
''
115-
else if lib.versionAtLeast finalAttrs.version "0.10" then
116-
''
117-
./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in langref.html
118-
''
119-
else
120-
null;
103+
'';
121104

122105
postInstall =
123106
if lib.versionAtLeast finalAttrs.version "0.13" then
124107
''
125108
install -Dm444 ../zig-out/doc/langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html
126109
''
127-
else if lib.versionAtLeast finalAttrs.version "0.10" then
110+
else
128111
''
129112
install -Dm444 langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html
130-
''
131-
else
132-
null;
113+
'';
133114

134115
doInstallCheck = true;
135116
installCheckPhase = ''

0 commit comments

Comments
 (0)