From 96c2125a8c56aad7a14b8d24e206fc0f61e2a520 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Tue, 4 Mar 2025 18:36:30 -0800 Subject: [PATCH 01/10] zig: 0.13 -> 0.14 --- pkgs/development/compilers/zig/default.nix | 5 +++++ pkgs/development/compilers/zig/generic.nix | 6 +++++- pkgs/top-level/all-packages.nix | 6 ++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index 77884dbbdb78..ba6db99f5f8b 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -4,6 +4,7 @@ llvmPackages_16, llvmPackages_17, llvmPackages_18, + llvmPackages_19, zigVersions ? { }, }: let @@ -20,6 +21,10 @@ let llvmPackages = llvmPackages_18; hash = "sha256-5qSiTq+UWGOwjDVZMIrAt2cDKHkyNPBSAEjpRQUByFM="; }; + "0.14.0" = { + llvmPackages = llvmPackages_19; + hash = "sha256-VyteIp5ZRt6qNcZR68KmM7CvN2GYf8vj5hP+gHLkuVk="; + }; } // zigVersions; mkPackage = diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 65959289cb6c..84f83b5aa709 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -111,7 +111,11 @@ stdenv.mkDerivation (finalAttrs: { ''; postBuild = - if lib.versionAtLeast finalAttrs.version "0.13" then + if lib.versionAtLeast finalAttrs.version "0.14" then + '' + stage3/bin/zig build langref --zig-lib-dir $(pwd)/stage3/lib/zig + '' + else if lib.versionAtLeast finalAttrs.version "0.13" then '' stage3/bin/zig build langref '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d57f2e59cd53..c4a82cdd1138 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10779,12 +10779,14 @@ with pkgs; zig_0_11 = zigPackages."0.11"; zig_0_12 = zigPackages."0.12"; zig_0_13 = zigPackages."0.13"; + zig_0_14 = zigPackages."0.14"; }) zigPackages zig_0_11 zig_0_12 - zig_0_13; + zig_0_13 + zig_0_14; - zig = zig_0_13; + zig = zig_0_14; zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv; From 7b9b602322d35a2769beadb16d93eaffb588caad Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Mar 2025 00:42:42 -0800 Subject: [PATCH 02/10] ncdu: pin to zig 0.13 --- pkgs/tools/misc/ncdu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 719d899e83bd..a0a724834b2b 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -4,7 +4,7 @@ fetchurl, ncurses, pkg-config, - zig, + zig_0_13, zstd, installShellFiles, testers, @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig.hook + zig_0_13.hook installShellFiles pkg-config ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pSub rodrgz ]; - inherit (zig.meta) platforms; + inherit (zig_0_13.meta) platforms; mainProgram = "ncdu"; }; }) From bfb5bb7fe5f0783af486b33b8138100709b35958 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Mar 2025 00:43:11 -0800 Subject: [PATCH 03/10] poop: pin to zig 0.13 --- pkgs/by-name/po/poop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/poop/package.nix b/pkgs/by-name/po/poop/package.nix index 9b42801c5ebd..3edae8fb889b 100644 --- a/pkgs/by-name/po/poop/package.nix +++ b/pkgs/by-name/po/poop/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - zig, + zig_0_13, }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - zig.hook + zig_0_13.hook ]; meta = with lib; { From 8a35708b84f5046b860c0794f3ac9f642fe946f3 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Mar 2025 00:44:12 -0800 Subject: [PATCH 04/10] superhtml: pin to zig 0.13 --- pkgs/by-name/su/superhtml/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/superhtml/package.nix b/pkgs/by-name/su/superhtml/package.nix index 8844a03e9416..eff91d54a5a1 100644 --- a/pkgs/by-name/su/superhtml/package.nix +++ b/pkgs/by-name/su/superhtml/package.nix @@ -3,7 +3,7 @@ callPackage, fetchFromGitHub, stdenv, - zig, + zig_0_13, }: stdenv.mkDerivation rec { pname = "superhtml"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - zig.hook + zig_0_13.hook ]; postPatch = '' From f77a948f26cc7949214584c42a32da40914cb5a0 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Mar 2025 01:18:38 -0800 Subject: [PATCH 05/10] river: pin to zig 0.13 --- pkgs/by-name/ri/river/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix index b96f58a2fa7c..fb24693c0b45 100644 --- a/pkgs/by-name/ri/river/package.nix +++ b/pkgs/by-name/ri/river/package.nix @@ -37,7 +37,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4ac0LGQtLldHyXJ2GIRMHV+VZfUrRFdBYLiAHX5lWcw="; }; - deps = callPackage ./build.zig.zon.nix { }; + deps = callPackage ./build.zig.zon.nix { + zig = zig_0_13; + }; nativeBuildInputs = [ pkg-config From ed7c190d98a314df0c126f3daf71dfa0f6bd5072 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Mar 2025 01:19:40 -0800 Subject: [PATCH 06/10] ghostty: pin to zig 0.13 --- pkgs/by-name/gh/ghostty/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index bf8359959186..eb48e995a235 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { deps = callPackage ./deps.nix { name = "${finalAttrs.pname}-cache-${finalAttrs.version}"; + zig = zig_0_13; }; strictDeps = true; From 1cc776321f86d48fbd77a9cb65ef465ec7b42209 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Mar 2025 01:20:06 -0800 Subject: [PATCH 07/10] flow-editor: pin to zig 0.13 --- pkgs/by-name/fl/flow-editor/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fl/flow-editor/package.nix b/pkgs/by-name/fl/flow-editor/package.nix index a5631a0bd4be..2186ffded5e0 100644 --- a/pkgs/by-name/fl/flow-editor/package.nix +++ b/pkgs/by-name/fl/flow-editor/package.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-D1pFP5tw323UJgWvLvh2sTiZG1hq5DP0FakdXEISRxs="; }; postPatch = '' - ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ln -s ${ + callPackage ./build.zig.zon.nix { + zig = zig_0_13; + } + } $ZIG_GLOBAL_CACHE_DIR/p ''; nativeBuildInputs = [ From c1a2b6279fa4041a7bcd007844989ef3e95eec96 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Mar 2025 01:21:18 -0800 Subject: [PATCH 08/10] waylock: pin to zig 0.13 --- pkgs/by-name/wa/waylock/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix index 53f8ff52e816..dce4eb51bfe6 100644 --- a/pkgs/by-name/wa/waylock/package.nix +++ b/pkgs/by-name/wa/waylock/package.nix @@ -26,7 +26,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-jfMSar+Y3inu1Cly6rIDw+akBJIQ6huL0smAstgQmEo="; }; - deps = callPackage ./build.zig.zon.nix { }; + deps = callPackage ./build.zig.zon.nix { + zig = zig_0_13; + }; nativeBuildInputs = [ pkg-config From 500eb29a69d1e45a5d7ff2aa9f79fdc4a7dcf7fa Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Mar 2025 01:21:59 -0800 Subject: [PATCH 09/10] cargo-lambda: pin to zig 0.13 --- pkgs/by-name/ca/cargo-lambda/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix index 006da2416bcd..c9a9bddfb301 100644 --- a/pkgs/by-name/ca/cargo-lambda/package.nix +++ b/pkgs/by-name/ca/cargo-lambda/package.nix @@ -8,7 +8,7 @@ pkg-config, openssl, stdenv, - zig, + zig_0_13, nix-update-script, }: @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig ]} + wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig_0_13 ]} ''; CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)"; From 1c82ff0d024ef366108c695fd11baad967fc9d90 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Mar 2025 01:23:21 -0800 Subject: [PATCH 10/10] ly: pin to zig 0.13 --- pkgs/applications/display-managers/ly/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix index 35221c4637c7..d7089ecee755 100644 --- a/pkgs/applications/display-managers/ly/default.nix +++ b/pkgs/applications/display-managers/ly/default.nix @@ -31,7 +31,11 @@ stdenv.mkDerivation { ]; postPatch = '' - ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ln -s ${ + callPackage ./deps.nix { + zig = zig_0_12; + } + } $ZIG_GLOBAL_CACHE_DIR/p ''; passthru.tests = { inherit (nixosTests) ly; };