From 2a7dd87f003f4df62a751b63ea465a2d0473f96f Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Wed, 14 Jan 2026 06:22:18 -0800 Subject: [PATCH] treewide: remove usage of zig.hook With recent changes to the zig setup hook, it is no longer necessary to include zig.hook in the derivation inputs. --- pkgs/by-name/bl/blackshades/package.nix | 2 +- pkgs/by-name/bo/bold/package.nix | 2 +- pkgs/by-name/bo/bork/package.nix | 2 +- pkgs/by-name/cr/creek/package.nix | 2 +- pkgs/by-name/dt/dt/package.nix | 2 +- pkgs/by-name/fa/fancy-cat/package.nix | 2 +- pkgs/by-name/fi/findup/package.nix | 2 +- pkgs/by-name/gh/ghostty/package.nix | 3 +-- pkgs/by-name/gl/glsl_analyzer/package.nix | 2 +- pkgs/by-name/he/hevi/package.nix | 2 +- pkgs/by-name/li/linuxwave/package.nix | 2 +- pkgs/by-name/ls/lsr/package.nix | 2 +- pkgs/by-name/ly/ly/package.nix | 2 +- pkgs/by-name/me/mepo/package.nix | 2 +- pkgs/by-name/mi/minizign/package.nix | 2 +- pkgs/by-name/nc/ncdu/package.nix | 2 +- pkgs/by-name/od/odiff/package.nix | 2 +- pkgs/by-name/ou/outfieldr/package.nix | 2 +- pkgs/by-name/po/poop/package.nix | 2 +- pkgs/by-name/ri/river-bedload/package.nix | 2 +- pkgs/by-name/ri/river-classic/package.nix | 2 +- pkgs/by-name/ri/river-ultitile/package.nix | 2 +- pkgs/by-name/ri/rivercarro/package.nix | 2 +- pkgs/by-name/su/superhtml/package.nix | 2 +- pkgs/by-name/tu/tuatara/package.nix | 2 +- pkgs/by-name/wa/waylock/package.nix | 2 +- pkgs/by-name/wa/wayprompt/package.nix | 2 +- pkgs/by-name/zi/zig-zlint/package.nix | 2 +- pkgs/by-name/zi/zigfetch/package.nix | 2 +- pkgs/by-name/zi/zigimports/package.nix | 2 +- pkgs/by-name/zo/zon2nix/package.nix | 2 +- pkgs/by-name/zs/zsnow/package.nix | 2 +- pkgs/by-name/zt/ztags/package.nix | 2 +- pkgs/development/compilers/arocc/package.nix | 2 +- pkgs/development/tools/zls/default.nix | 4 ++-- 35 files changed, 36 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/bl/blackshades/package.nix b/pkgs/by-name/bl/blackshades/package.nix index 137c4c902555..b26ecf1b0b17 100644 --- a/pkgs/by-name/bl/blackshades/package.nix +++ b/pkgs/by-name/bl/blackshades/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { } $ZIG_GLOBAL_CACHE_DIR/p ''; - nativeBuildInputs = [ zig_0_14.hook ]; + nativeBuildInputs = [ zig_0_14 ]; buildInputs = [ glfw diff --git a/pkgs/by-name/bo/bold/package.nix b/pkgs/by-name/bo/bold/package.nix index e9438a35a704..b6892bc699a0 100644 --- a/pkgs/by-name/bo/bold/package.nix +++ b/pkgs/by-name/bo/bold/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - zig.hook + zig ]; doInstallCheck = true; diff --git a/pkgs/by-name/bo/bork/package.nix b/pkgs/by-name/bo/bork/package.nix index e19a6bbcb65c..d3b22a18a342 100644 --- a/pkgs/by-name/bo/bork/package.nix +++ b/pkgs/by-name/bo/bork/package.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation { }; nativeBuildInputs = [ - zig.hook + zig ]; buildInputs = [ diff --git a/pkgs/by-name/cr/creek/package.nix b/pkgs/by-name/cr/creek/package.nix index e68f872896fa..13f51ec04587 100644 --- a/pkgs/by-name/cr/creek/package.nix +++ b/pkgs/by-name/cr/creek/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ - zig.hook + zig pkg-config wayland-scanner ]; diff --git a/pkgs/by-name/dt/dt/package.nix b/pkgs/by-name/dt/dt/package.nix index 3a4e6da36c35..0e1211ca2de3 100644 --- a/pkgs/by-name/dt/dt/package.nix +++ b/pkgs/by-name/dt/dt/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-pfTlOMJpOPbXZaJJvOKDUyCZxFHNLRRUteJFWT9IKOU="; }; - nativeBuildInputs = [ zig_0_13.hook ]; + nativeBuildInputs = [ zig_0_13 ]; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/fa/fancy-cat/package.nix b/pkgs/by-name/fa/fancy-cat/package.nix index 641b50a7d707..09e69e28712d 100644 --- a/pkgs/by-name/fa/fancy-cat/package.nix +++ b/pkgs/by-name/fa/fancy-cat/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./0001-changes.patch ]; nativeBuildInputs = [ - zig_0_14.hook + zig_0_14 ]; zigBuildFlags = [ "--release=fast" ]; diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix index 9f10c1f2130e..0f5fd7506215 100644 --- a/pkgs/by-name/fi/findup/package.nix +++ b/pkgs/by-name/fi/findup/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-6/rQ4xNfzJQwJgrpvFRuirqlx6fVn7sLXfVRFsG3fUw="; }; - nativeBuildInputs = [ zig.hook ]; + nativeBuildInputs = [ zig ]; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index b08023c70e1c..2baa4e26ffc2 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -24,8 +24,7 @@ wrapGAppsHook4, zig_0_14, - # Usually you would override `zig.hook` with this, but we do that internally - # since upstream recommends a non-default level + # Upstream recommends a non-default level # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/PACKAGING.md#build-options optimizeLevel ? "ReleaseFast", }: diff --git a/pkgs/by-name/gl/glsl_analyzer/package.nix b/pkgs/by-name/gl/glsl_analyzer/package.nix index 0b53a622d192..86d6f4d25a5b 100644 --- a/pkgs/by-name/gl/glsl_analyzer/package.nix +++ b/pkgs/by-name/gl/glsl_analyzer/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig.hook + zig ]; postPatch = '' diff --git a/pkgs/by-name/he/hevi/package.nix b/pkgs/by-name/he/hevi/package.nix index 9e30696da500..91c72dda0583 100644 --- a/pkgs/by-name/he/hevi/package.nix +++ b/pkgs/by-name/he/hevi/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig.hook + zig ]; postPatch = '' diff --git a/pkgs/by-name/li/linuxwave/package.nix b/pkgs/by-name/li/linuxwave/package.nix index 8f7b2d92f14f..328365d834bb 100644 --- a/pkgs/by-name/li/linuxwave/package.nix +++ b/pkgs/by-name/li/linuxwave/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles - zig.hook + zig ]; postInstall = '' diff --git a/pkgs/by-name/ls/lsr/package.nix b/pkgs/by-name/ls/lsr/package.nix index ba458cf30419..01c70c41c696 100644 --- a/pkgs/by-name/ls/lsr/package.nix +++ b/pkgs/by-name/ls/lsr/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles - zig.hook + zig ]; doInstallCheck = true; diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix index a89eea2df810..d92c7aaefb39 100644 --- a/pkgs/by-name/ly/ly/package.nix +++ b/pkgs/by-name/ly/ly/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper - zig_0_15.hook + zig_0_15 ]; buildInputs = [ linux-pam diff --git a/pkgs/by-name/me/mepo/package.nix b/pkgs/by-name/me/mepo/package.nix index 074ba71d7cdb..d2fc9166a9ce 100644 --- a/pkgs/by-name/me/mepo/package.nix +++ b/pkgs/by-name/me/mepo/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - zig_0_14.hook + zig_0_14 makeWrapper ]; diff --git a/pkgs/by-name/mi/minizign/package.nix b/pkgs/by-name/mi/minizign/package.nix index 2271e1b57eab..3bab3ac74526 100644 --- a/pkgs/by-name/mi/minizign/package.nix +++ b/pkgs/by-name/mi/minizign/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig.hook + zig ]; meta = { diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix index f1cc506086fb..ad12df23228e 100644 --- a/pkgs/by-name/nc/ncdu/package.nix +++ b/pkgs/by-name/nc/ncdu/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig_0_15.hook + zig_0_15 installShellFiles pkg-config ]; diff --git a/pkgs/by-name/od/odiff/package.nix b/pkgs/by-name/od/odiff/package.nix index 60f009609911..9341e8a6fd19 100644 --- a/pkgs/by-name/od/odiff/package.nix +++ b/pkgs/by-name/od/odiff/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles - zig.hook + zig nasm ]; diff --git a/pkgs/by-name/ou/outfieldr/package.nix b/pkgs/by-name/ou/outfieldr/package.nix index 569c2a8180e2..08f2a011a238 100644 --- a/pkgs/by-name/ou/outfieldr/package.nix +++ b/pkgs/by-name/ou/outfieldr/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig.hook + zig ]; meta = { diff --git a/pkgs/by-name/po/poop/package.nix b/pkgs/by-name/po/poop/package.nix index ad25fd8920f1..18fc82adc275 100644 --- a/pkgs/by-name/po/poop/package.nix +++ b/pkgs/by-name/po/poop/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig_0_13.hook + zig_0_13 ]; meta = { diff --git a/pkgs/by-name/ri/river-bedload/package.nix b/pkgs/by-name/ri/river-bedload/package.nix index 00ca3732a887..746a0e3dd395 100644 --- a/pkgs/by-name/ri/river-bedload/package.nix +++ b/pkgs/by-name/ri/river-bedload/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - zig.hook + zig ]; buildInputs = [ diff --git a/pkgs/by-name/ri/river-classic/package.nix b/pkgs/by-name/ri/river-classic/package.nix index 4fb8c9af942d..4a2960157a7f 100644 --- a/pkgs/by-name/ri/river-classic/package.nix +++ b/pkgs/by-name/ri/river-classic/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config wayland-scanner xwayland - zig_0_15.hook + zig_0_15 ] ++ lib.optional withManpages scdoc; diff --git a/pkgs/by-name/ri/river-ultitile/package.nix b/pkgs/by-name/ri/river-ultitile/package.nix index 83c5c351a7a7..9127515a4977 100644 --- a/pkgs/by-name/ri/river-ultitile/package.nix +++ b/pkgs/by-name/ri/river-ultitile/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig.hook + zig pkg-config wayland wayland-scanner diff --git a/pkgs/by-name/ri/rivercarro/package.nix b/pkgs/by-name/ri/rivercarro/package.nix index 4e6cc44df1a0..c88e5ec61589 100644 --- a/pkgs/by-name/ri/rivercarro/package.nix +++ b/pkgs/by-name/ri/rivercarro/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { wayland wayland-protocols wayland-scanner - zig.hook + zig ]; postPatch = '' diff --git a/pkgs/by-name/su/superhtml/package.nix b/pkgs/by-name/su/superhtml/package.nix index e097b3ff019c..2ade74c68c09 100644 --- a/pkgs/by-name/su/superhtml/package.nix +++ b/pkgs/by-name/su/superhtml/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig.hook + zig ]; postPatch = '' diff --git a/pkgs/by-name/tu/tuatara/package.nix b/pkgs/by-name/tu/tuatara/package.nix index 56fd5d90cf67..b473431a23a5 100644 --- a/pkgs/by-name/tu/tuatara/package.nix +++ b/pkgs/by-name/tu/tuatara/package.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ zig_0_13.hook ]; + nativeBuildInputs = [ zig_0_13 ]; preBuild = '' export ZIG_LOCAL_CACHE_DIR=$TMPDIR/zig-cache diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix index 7996b1e15786..3c5e8ccdafe1 100644 --- a/pkgs/by-name/wa/waylock/package.nix +++ b/pkgs/by-name/wa/waylock/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config scdoc wayland-scanner - zig_0_15.hook + zig_0_15 ]; buildInputs = [ diff --git a/pkgs/by-name/wa/wayprompt/package.nix b/pkgs/by-name/wa/wayprompt/package.nix index 6079149de5ae..a52ab9091391 100644 --- a/pkgs/by-name/wa/wayprompt/package.nix +++ b/pkgs/by-name/wa/wayprompt/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { deps = callPackage ./build.zig.zon.nix { }; nativeBuildInputs = [ - zig_0_13.hook + zig_0_13 pkg-config wayland wayland-scanner diff --git a/pkgs/by-name/zi/zig-zlint/package.nix b/pkgs/by-name/zi/zig-zlint/package.nix index cfce73d35be6..55ced9c402e5 100644 --- a/pkgs/by-name/zi/zig-zlint/package.nix +++ b/pkgs/by-name/zi/zig-zlint/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig_0_14.hook + zig_0_14 ]; zigBuildFlags = [ diff --git a/pkgs/by-name/zi/zigfetch/package.nix b/pkgs/by-name/zi/zigfetch/package.nix index 6a94023f9c0f..7b30fbe27fe4 100644 --- a/pkgs/by-name/zi/zigfetch/package.nix +++ b/pkgs/by-name/zi/zigfetch/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - zig.hook + zig ]; buildInputs = [ diff --git a/pkgs/by-name/zi/zigimports/package.nix b/pkgs/by-name/zi/zigimports/package.nix index 75e40f07299f..4b8b0d5f0a87 100644 --- a/pkgs/by-name/zi/zigimports/package.nix +++ b/pkgs/by-name/zi/zigimports/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig_0_13.hook + zig_0_13 ]; # Remove the system suffix on the program name. diff --git a/pkgs/by-name/zo/zon2nix/package.nix b/pkgs/by-name/zo/zon2nix/package.nix index 1d2bdd9cefe5..bb757978c460 100644 --- a/pkgs/by-name/zo/zon2nix/package.nix +++ b/pkgs/by-name/zo/zon2nix/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig_0_14.hook + zig_0_14 ]; zigBuildFlags = [ diff --git a/pkgs/by-name/zs/zsnow/package.nix b/pkgs/by-name/zs/zsnow/package.nix index 253e95081101..61f5488d0e20 100644 --- a/pkgs/by-name/zs/zsnow/package.nix +++ b/pkgs/by-name/zs/zsnow/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig.hook + zig pkg-config wayland-scanner ]; diff --git a/pkgs/by-name/zt/ztags/package.nix b/pkgs/by-name/zt/ztags/package.nix index 9113ff02aca3..2c407cb74d6c 100644 --- a/pkgs/by-name/zt/ztags/package.nix +++ b/pkgs/by-name/zt/ztags/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ scdoc - zig.hook + zig ]; postInstall = '' diff --git a/pkgs/development/compilers/arocc/package.nix b/pkgs/development/compilers/arocc/package.nix index 5b9766308ae5..0351472a757a 100644 --- a/pkgs/development/compilers/arocc/package.nix +++ b/pkgs/development/compilers/arocc/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "arocc"; inherit version src; - nativeBuildInputs = [ zig.hook ]; + nativeBuildInputs = [ zig ]; passthru = { inherit zig; diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/zls/default.nix index 31b58ca0121d..849309893cdf 100644 --- a/pkgs/development/tools/zls/default.nix +++ b/pkgs/development/tools/zls/default.nix @@ -38,7 +38,7 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension)) hash = "sha256-A5Mn+mfIefOsX+eNBRHrDVkqFDVrD3iXDNsUL4TPhKo="; }; - nativeBuildInputs = [ zig_0_14.hook ]; + nativeBuildInputs = [ zig_0_14 ]; postPatch = '' ln -s ${callPackage ./deps_0_14.nix { }} $ZIG_GLOBAL_CACHE_DIR/p @@ -56,7 +56,7 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension)) hash = "sha256-6IkRtQkn+qUHDz00QvCV/rb2yuF6xWEXug41CD8LLw8="; }; - nativeBuildInputs = [ zig_0_15.hook ]; + nativeBuildInputs = [ zig_0_15 ]; postPatch = '' ln -s ${callPackage ./deps_0_15.nix { }} $ZIG_GLOBAL_CACHE_DIR/p