From 57e086f7c0afca8d2c6b1392174862ae8a3234c9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:38 +0100 Subject: [PATCH 01/10] aerospace: correct versionCheckHook use --- pkgs/by-name/ae/aerospace/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ae/aerospace/package.nix b/pkgs/by-name/ae/aerospace/package.nix index 29c2c7faa6809..7b3ecdb894e05 100644 --- a/pkgs/by-name/ae/aerospace/package.nix +++ b/pkgs/by-name/ae/aerospace/package.nix @@ -39,7 +39,10 @@ stdenv.mkDerivation { installShellCompletion --zsh shell-completion/zsh/_aerospace ''; - passthru.tests.can-print-version = [ versionCheckHook ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; passthru.updateScript = gitUpdater { url = "https://github.com/nikitabobko/AeroSpace.git"; From efdd819a011889f0fb98093be631468617467a4b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:38 +0100 Subject: [PATCH 02/10] cloudpan189-go: correct versionCheckHook use --- pkgs/by-name/cl/cloudpan189-go/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/cl/cloudpan189-go/package.nix b/pkgs/by-name/cl/cloudpan189-go/package.nix index e3f61182d052d..f3259db436635 100644 --- a/pkgs/by-name/cl/cloudpan189-go/package.nix +++ b/pkgs/by-name/cl/cloudpan189-go/package.nix @@ -22,6 +22,7 @@ buildGo122Module rec { ''; }; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From e22406ebcadee03cf66974c03fe458265d4fdf1b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:39 +0100 Subject: [PATCH 03/10] deepsource: correct versionCheckHook use --- pkgs/by-name/de/deepsource/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/de/deepsource/package.nix b/pkgs/by-name/de/deepsource/package.nix index 10d48b0fc4ceb..39f97281d73b2 100644 --- a/pkgs/by-name/de/deepsource/package.nix +++ b/pkgs/by-name/de/deepsource/package.nix @@ -48,6 +48,8 @@ buildGoModule rec { --zsh <($out/bin/deepsource completion zsh) ''; + doInstallCheck = true; + versionCheckProgramArg = [ "version" ]; nativeInstallCheckInputs = [ versionCheckHook ]; From 0de44d11428f73b05897146bbe74828c9ed100b2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:39 +0100 Subject: [PATCH 04/10] envision-unwrapped: correct versionCheckHook use --- pkgs/by-name/en/envision-unwrapped/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index de64e6eb852ef..7260bf80d51e6 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config rustPlatform.cargoSetupHook rustc - versionCheckHook wrapGAppsHook4 ]; @@ -87,6 +86,14 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; + # FIXME: error when running `env -i envision`: + # "HOME env var not defined: NotPresent" + doInstallCheck = false; + versionCheckProgram = "${placeholder "out"}/bin/envision"; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + postInstall = '' wrapProgram $out/bin/envision \ --prefix PATH : "${lib.makeBinPath [ gdb ]}" From 2c9593b5a3b217ad9390c95ecf67318cdfcf2377 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:39 +0100 Subject: [PATCH 05/10] gollama: correct versionCheckHook use --- pkgs/by-name/go/gollama/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix index 30e4006a656df..75e97c841c7d9 100644 --- a/pkgs/by-name/go/gollama/package.nix +++ b/pkgs/by-name/go/gollama/package.nix @@ -16,6 +16,11 @@ buildGoModule rec { hash = "sha256-7wCBflX34prZJl4HhZUU2a2qHxaBs1fMKHpwE0vX1GE="; }; + postPatch = '' + substituteInPlace main.go \ + --replace-fail 'Version = "1.28.0"' 'Version = "${version}"' + ''; + vendorHash = "sha256-Y5yg54em+vqoWXxS3JVQVPEM+fLXgoblmY+48WpxSCQ="; doCheck = false; @@ -25,7 +30,10 @@ buildGoModule rec { "-w" ]; - nativeInputChecks = [ + # FIXME: error when running `env -i gollama`: + # "Error initializing logging: $HOME is not defined" + doInstallCheck = false; + nativeInstallCheckInputs = [ versionCheckHook ]; From 793d897fe0204e6e840af3608268396a395c044f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:39 +0100 Subject: [PATCH 06/10] mergiraf: correct versionCheckHook use --- pkgs/by-name/me/mergiraf/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index a322f863ab051..21c02e1dc022a 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -26,6 +26,10 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ git + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; From 504e6ffdc4234cf1393e1182958fbbb355cae1b5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:40 +0100 Subject: [PATCH 07/10] nixpkgs-review: correct versionCheckHook use --- pkgs/by-name/ni/nixpkgs-review/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix index 5b20425a25e12..155251f82dc0b 100644 --- a/pkgs/by-name/ni/nixpkgs-review/package.nix +++ b/pkgs/by-name/ni/nixpkgs-review/package.nix @@ -70,7 +70,8 @@ python3Packages.buildPythonApplication rec { done ''; - nativeCheckInputs = [ + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; From 520728f3e0b51de572ccf382eb101fcf87bb2bca Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:40 +0100 Subject: [PATCH 08/10] nvitop: correct versionCheckHook use --- pkgs/by-name/nv/nvitop/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix index cce03aca75c74..e7b5a861defbf 100644 --- a/pkgs/by-name/nv/nvitop/package.nix +++ b/pkgs/by-name/nv/nvitop/package.nix @@ -25,7 +25,8 @@ python3Packages.buildPythonApplication rec { nvidia-ml-py ]; - nativeCheckInputs = [ + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; From 1217130d9958eecbd46c542d3ab33ad4140611cb Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:40 +0100 Subject: [PATCH 09/10] upbound: correct versionCheckHook use --- pkgs/by-name/up/upbound/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/up/upbound/package.nix b/pkgs/by-name/up/upbound/package.nix index 0315f96004933..51046a403ff27 100644 --- a/pkgs/by-name/up/upbound/package.nix +++ b/pkgs/by-name/up/upbound/package.nix @@ -50,6 +50,10 @@ stdenvNoCC.mkDerivation { installShellCompletion --bash --name up <(echo complete -C up up) ''; + # FIXME: error when running `env -i up`: + # "up: error: $HOME is not defined" + doInstallCheck = false; + versionCheckProgram = "${placeholder "out"}/bin/up"; versionCheckProgramArg = "version"; nativeInstallCheckInputs = [ @@ -63,10 +67,6 @@ stdenvNoCC.mkDerivation { "${version-channel}" ]; - passthru.tests = { - versionCheck = versionCheckHook; - }; - meta = { description = "CLI for interacting with Upbound Cloud, Upbound Enterprise, and Universal Crossplane (UXP)"; homepage = "https://upbound.io"; From d71e753dbb58e8bdf99d7e4a4b8e4367dd82da91 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:15:10 +0100 Subject: [PATCH 10/10] astroterm: correct versionCheckHook use --- pkgs/by-name/as/astroterm/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/as/astroterm/package.nix b/pkgs/by-name/as/astroterm/package.nix index 9ed753ef05ebb..3cdde4b2e9952 100644 --- a/pkgs/by-name/as/astroterm/package.nix +++ b/pkgs/by-name/as/astroterm/package.nix @@ -31,13 +31,17 @@ stdenv.mkDerivation (finalAttrs: { meson ninja xxd - versionCheckHook ]; buildInputs = [ argtable ncurses ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + postPatch = '' mkdir -p data ln -s ${finalAttrs.bsc5File} data/bsc5