From 17d404ee80589efa8473cf1b50d031487329419a Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 20:43:09 -0400 Subject: zig.hook: rename from zigHook This makes using specific versions of zig easier (without overrides) --- pkgs/applications/misc/colorstorm/default.nix | 6 +- pkgs/applications/misc/mepo/default.nix | 4 +- pkgs/applications/misc/rivercarro/default.nix | 6 +- pkgs/applications/misc/waylock/default.nix | 4 +- .../applications/window-managers/river/default.nix | 4 +- pkgs/development/compilers/zig/0.10.nix | 1 + pkgs/development/compilers/zig/0.11.nix | 1 + pkgs/development/compilers/zig/0.9.1.nix | 1 + pkgs/development/compilers/zig/generic.nix | 7 +++ .../tools/language-servers/zls/default.nix | 4 +- pkgs/games/blackshades/default.nix | 4 +- pkgs/tools/audio/linuxwave/default.nix | 6 +- pkgs/tools/misc/clipbuzz/default.nix | 4 +- pkgs/tools/misc/findup/default.nix | 5 +- pkgs/tools/misc/ncdu/default.nix | 6 +- pkgs/tools/misc/poop/default.nix | 4 +- pkgs/tools/misc/zf/default.nix | 5 +- pkgs/tools/text/dt/default.nix | 4 +- pkgs/top-level/all-packages.nix | 71 ++++------------------ 19 files changed, 53 insertions(+), 94 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/colorstorm/default.nix b/pkgs/applications/misc/colorstorm/default.nix index 540d315d6371..0f78510aa2f6 100644 --- a/pkgs/applications/misc/colorstorm/default.nix +++ b/pkgs/applications/misc/colorstorm/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, zigHook +, zig_0_9 }: stdenv.mkDerivation (finalAttrs: { @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zigHook + zig_0_9.hook ]; meta = { @@ -24,6 +24,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/benbusby/colorstorm"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; - inherit (zigHook.meta) platforms; + inherit (zig_0_9.meta) platforms; }; }) diff --git a/pkgs/applications/misc/mepo/default.nix b/pkgs/applications/misc/mepo/default.nix index 54078891bd2b..a16b0bfebf59 100644 --- a/pkgs/applications/misc/mepo/default.nix +++ b/pkgs/applications/misc/mepo/default.nix @@ -17,7 +17,7 @@ , util-linux , xwininfo , zenity -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - zigHook + zig_0_10.hook makeWrapper ]; diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/applications/misc/rivercarro/default.nix index ff53ba1a769f..59537500878e 100644 --- a/pkgs/applications/misc/rivercarro/default.nix +++ b/pkgs/applications/misc/rivercarro/default.nix @@ -4,7 +4,7 @@ , pkg-config , river , wayland -, zigHook +, zig_0_9 }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config river wayland - zigHook + zig_0_9.hook ]; meta = with lib; { @@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://git.sr.ht/~novakane/rivercarro/refs/v${finalAttrs.version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kraem ]; - inherit (zigHook.meta) platforms; + inherit (zig_0_9.meta) platforms; }; }) diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index cfd4afee67b3..ba2a97534d36 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -7,7 +7,7 @@ , scdoc , wayland , wayland-protocols -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config scdoc wayland - zigHook + zig_0_10.hook ]; buildInputs = [ diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 41b9324db413..53714a03c5c3 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -14,7 +14,7 @@ , wayland-protocols , wlroots_0_16 , xwayland -, zigHook +, zig_0_10 , withManpages ? true , xwaylandSupport ? true }: @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config wayland xwayland - zigHook + zig_0_10.hook ] ++ lib.optional withManpages scdoc; diff --git a/pkgs/development/compilers/zig/0.10.nix b/pkgs/development/compilers/zig/0.10.nix index c21a51afa5b3..9262679d2028 100644 --- a/pkgs/development/compilers/zig/0.10.nix +++ b/pkgs/development/compilers/zig/0.10.nix @@ -6,6 +6,7 @@ , libxml2 , zlib , coreutils +, callPackage }@args: import ./generic.nix args { diff --git a/pkgs/development/compilers/zig/0.11.nix b/pkgs/development/compilers/zig/0.11.nix index 7c4fcedc0538..b393f42c6513 100644 --- a/pkgs/development/compilers/zig/0.11.nix +++ b/pkgs/development/compilers/zig/0.11.nix @@ -6,6 +6,7 @@ , libxml2 , zlib , coreutils +, callPackage }@args: import ./generic.nix args { diff --git a/pkgs/development/compilers/zig/0.9.1.nix b/pkgs/development/compilers/zig/0.9.1.nix index a05d5ae893cf..fa72647d6cc0 100644 --- a/pkgs/development/compilers/zig/0.9.1.nix +++ b/pkgs/development/compilers/zig/0.9.1.nix @@ -6,6 +6,7 @@ , libxml2 , zlib , coreutils +, callPackage }@args: import ./generic.nix args { diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 5cc75cbbf6eb..4651e9e68e54 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -6,6 +6,7 @@ , libxml2 , zlib , coreutils +, callPackage , ... }: @@ -53,6 +54,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstallCheck ''; + passthru = { + hook = callPackage ./hook.nix { + zig = finalAttrs.finalPackage; + }; + }; + meta = { description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; homepage = "https://ziglang.org/"; diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix index 1bf1f3dbb7b2..7e76942c1598 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/development/tools/language-servers/zls/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, zigHook +, zig , callPackage }: @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zigHook + zig.hook ]; postPatch = '' diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index c107b068816c..80fc72341501 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -6,7 +6,7 @@ , libGLU , libsndfile , openal -, zigHook +, zig_0_9 }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Hg+VcWI28GzY/CPm1lUftP0RGztOnzizrKJQVTmeJ9I="; }; - nativeBuildInputs = [ zigHook ]; + nativeBuildInputs = [ zig_0_9.hook ]; buildInputs = [ glfw diff --git a/pkgs/tools/audio/linuxwave/default.nix b/pkgs/tools/audio/linuxwave/default.nix index 213a40909886..98860675dafc 100644 --- a/pkgs/tools/audio/linuxwave/default.nix +++ b/pkgs/tools/audio/linuxwave/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , installShellFiles -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles - zigHook + zig_0_10.hook ]; postInstall = '' @@ -32,6 +32,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/orhun/linuxwave/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda ]; - inherit (zigHook.meta) platforms; + inherit (zig_0_10.meta) platforms; }; }) diff --git a/pkgs/tools/misc/clipbuzz/default.nix b/pkgs/tools/misc/clipbuzz/default.nix index 9d901f90a205..47dbbc6e6ff2 100644 --- a/pkgs/tools/misc/clipbuzz/default.nix +++ b/pkgs/tools/misc/clipbuzz/default.nix @@ -3,7 +3,7 @@ , fetchFromSourcehut , libX11 , libXfixes -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-V5bAZHoScTzFZBPUhPd7xc/c32SXPLAJp+vsc/lCyeI="; }; - nativeBuildInputs = [ zigHook ]; + nativeBuildInputs = [ zig_0_10.hook ]; buildInputs = [ libX11 diff --git a/pkgs/tools/misc/findup/default.nix b/pkgs/tools/misc/findup/default.nix index 11bf1918574d..d196192447d8 100644 --- a/pkgs/tools/misc/findup/default.nix +++ b/pkgs/tools/misc/findup/default.nix @@ -1,9 +1,8 @@ { lib , stdenv , fetchFromGitHub -, findup , testers -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Tpyiy5oJQ04lqVEOFshFC0+90VoNILQ+N6Dd7lbuH/Q="; }; - nativeBuildInputs = [ zigHook ]; + nativeBuildInputs = [ zig_0_10.hook ]; passthru.tests.version = testers.testVersion { package = finalAttrs.findup; }; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 3cb407756f67..8e66e775c1fc 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zigHook + zig_0_10.hook ]; buildInputs = [ @@ -28,6 +28,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://dev.yorhel.nl/ncdu/changes2"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pSub rodrgz ]; - inherit (zigHook.meta) platforms; + inherit (zig_0_10.meta) platforms; }; }) diff --git a/pkgs/tools/misc/poop/default.nix b/pkgs/tools/misc/poop/default.nix index 8c30f409ed33..d07c2c150be3 100644 --- a/pkgs/tools/misc/poop/default.nix +++ b/pkgs/tools/misc/poop/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , fetchpatch -, zigHook +, zig }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - zigHook + zig.hook ]; meta = with lib; { diff --git a/pkgs/tools/misc/zf/default.nix b/pkgs/tools/misc/zf/default.nix index 1dec403dcd92..041f2a3989cc 100644 --- a/pkgs/tools/misc/zf/default.nix +++ b/pkgs/tools/misc/zf/default.nix @@ -3,8 +3,7 @@ , fetchFromGitHub , installShellFiles , testers -, zf -, zigHook +, zig_0_10 }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles - zigHook + zig_0_10.hook ]; doCheck = false; # it's failing somehow diff --git a/pkgs/tools/text/dt/default.nix b/pkgs/tools/text/dt/default.nix index b0b269d0c430..e4c6894050ff 100644 --- a/pkgs/tools/text/dt/default.nix +++ b/pkgs/tools/text/dt/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , testers -, zigHook +, zig }: stdenv.mkDerivation (finalAttrs: { @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-C6sG8iqXs64x2AWCxKGFPyoXC1Fn4p2eSLWwJAQ8CSc="; }; - nativeBuildInputs = [ zigHook ]; + nativeBuildInputs = [ zig.hook ]; passthru.tests.version = testers.testVersion { package = finalAttrs.dt; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94b81faec919..361830c72f5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -509,11 +509,7 @@ with pkgs; colorpicker = callPackage ../tools/misc/colorpicker { }; - colorstorm = callPackage ../applications/misc/colorstorm { - zigHook = zigHook.override { - zig = buildPackages.zig_0_9; - }; - }; + colorstorm = callPackage ../applications/misc/colorstorm { }; comedilib = callPackage ../development/libraries/comedilib { }; @@ -6143,17 +6139,9 @@ with pkgs; rex = callPackage ../tools/system/rex { }; - river = callPackage ../applications/window-managers/river { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + river = callPackage ../applications/window-managers/river { }; - rivercarro = callPackage ../applications/misc/rivercarro { - zigHook = zigHook.override { - zig = buildPackages.zig_0_9; - }; - }; + rivercarro = callPackage ../applications/misc/rivercarro { }; river-luatile = callPackage ../applications/misc/river-luatile{ }; @@ -8001,11 +7989,7 @@ with pkgs; findutils = callPackage ../tools/misc/findutils { }; - findup = callPackage ../tools/misc/findup { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + findup = callPackage ../tools/misc/findup { }; fingerprintx = callPackage ../tools/security/fingerprintx { }; @@ -9728,11 +9712,7 @@ with pkgs; ffmpeg = ffmpeg-full; }; - linuxwave = callPackage ../tools/audio/linuxwave { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + linuxwave = callPackage ../tools/audio/linuxwave { }; littlefs-fuse = callPackage ../tools/filesystems/littlefs-fuse { }; @@ -14755,11 +14735,7 @@ with pkgs; stdenv = if stdenv.isDarwin then llvmPackages_16.stdenv else stdenv; }; - clipbuzz = callPackage ../tools/misc/clipbuzz { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + clipbuzz = callPackage ../tools/misc/clipbuzz { }; xclip = callPackage ../tools/misc/xclip { }; @@ -18346,11 +18322,7 @@ with pkgs; vscode-langservers-extracted = callPackage ../development/tools/language-servers/vscode-langservers-extracted { }; - zls = callPackage ../development/tools/language-servers/zls { - zigHook = zigHook.override { - zig = buildPackages.zig_0_11; - }; - }; + zls = callPackage ../development/tools/language-servers/zls { }; ansible-later = callPackage ../tools/admin/ansible/later.nix { }; @@ -25569,8 +25541,6 @@ with pkgs; }; zig = zig_0_11; - zigHook = callPackage ../development/compilers/zig/hook.nix { }; - zimlib = callPackage ../development/libraries/zimlib { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; @@ -32461,11 +32431,7 @@ with pkgs; waycorner = callPackage ../applications/misc/waycorner { }; - waylock = callPackage ../applications/misc/waylock { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + waylock = callPackage ../applications/misc/waylock { }; wayshot = callPackage ../tools/misc/wayshot { }; @@ -33445,9 +33411,6 @@ with pkgs; mepo = callPackage ../applications/misc/mepo { inherit (gnome) zenity; - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; }; meshcentral = callPackage ../tools/admin/meshcentral { }; @@ -34116,11 +34079,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; - ncdu = callPackage ../tools/misc/ncdu { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + ncdu = callPackage ../tools/misc/ncdu { }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; @@ -37282,11 +37241,7 @@ with pkgs; inherit (perlPackages) PathTiny; }; - blackshades = callPackage ../games/blackshades { - zigHook = zigHook.override { - zig = buildPackages.zig_0_9; - }; - }; + blackshades = callPackage ../games/blackshades { }; blobby = callPackage ../games/blobby { }; @@ -41756,11 +41711,7 @@ with pkgs; duden = callPackage ../applications/misc/duden { }; - zf = callPackage ../tools/misc/zf { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + zf = callPackage ../tools/misc/zf { }; isolate = callPackage ../tools/security/isolate { }; -- cgit 1.4.1