treewide: fix versionCheckHook in nativeInstallCheck (#399584)

authored by Gaétan Lepage and committed by GitHub fbf567ce 9fa9c157

+22 -25
+9 -6
pkgs/by-name/az/az-pim-cli/package.nix
··· 5 5 installShellFiles, 6 6 stdenv, 7 7 buildPackages, 8 - versionCheckHook, 9 8 nix-update-script, 9 + testers, 10 + az-pim-cli, 10 11 }: 11 12 buildGoModule (finalAttrs: { 12 13 pname = "az-pim-cli"; ··· 37 38 '' 38 39 ); 39 40 40 - doInstallCheck = true; 41 - nativeInstallCheck = [ versionCheckHook ]; 42 - versionCheckProgramArg = "version"; 43 - 44 - passthru.updateScript = nix-update-script { }; 41 + passthru = { 42 + updateScript = nix-update-script { }; 43 + tests.version = testers.testVersion { 44 + command = "HOME=$TMPDIR az-pim-cli --version"; 45 + package = az-pim-cli; 46 + }; 47 + }; 45 48 46 49 meta = { 47 50 description = "List and activate Azure Entra ID Privileged Identity Management roles from the CLI";
+1 -1
pkgs/by-name/fo/foodfetch/package.nix
··· 25 25 buildInputs = [ openssl ]; 26 26 27 27 doInstallCheck = true; 28 - nativeInstallCheck = [ versionCheckHook ]; 28 + nativeInstallCheckInputs = [ versionCheckHook ]; 29 29 30 30 passthru.updateScript = nix-update-script { }; 31 31
+1 -1
pkgs/by-name/kr/krep/package.nix
··· 27 27 28 28 doCheck = true; 29 29 doInstallCheck = true; 30 - nativeInstallCheck = [ versionCheckHook ]; 30 + nativeInstallCheckInputs = [ versionCheckHook ]; 31 31 32 32 meta = { 33 33 description = "Blazingly fast string search utility designed for performance-critical applications";
-5
pkgs/by-name/ol/ollama/package.nix
··· 19 19 cudaArches ? cudaPackages.cudaFlags.realArches or [ ], 20 20 darwin, 21 21 autoAddDriverRunpath, 22 - versionCheckHook, 23 22 24 23 # passthru 25 24 nixosTests, ··· 246 245 ]; 247 246 248 247 __darwinAllowLocalNetworking = true; 249 - 250 - nativeInstallCheck = [ versionCheckHook ]; 251 - versionCheckProgramArg = "--version"; 252 - doInstallCheck = true; 253 248 254 249 passthru = { 255 250 tests =
+1 -1
pkgs/by-name/pe/petidomo/package.nix
··· 32 32 doCheck = true; 33 33 34 34 doInstallCheck = true; 35 - nativeInstallCheck = [ versionCheckHook ]; 35 + nativeInstallCheckInputs = [ versionCheckHook ]; 36 36 37 37 meta = { 38 38 homepage = "https://petidomo.sourceforge.net/";
-5
pkgs/by-name/ru/rust-stakeholder/package.nix
··· 2 2 lib, 3 3 fetchFromGitHub, 4 4 rustPlatform, 5 - versionCheckHook, 6 5 nix-update-script, 7 6 }: 8 7 rustPlatform.buildRustPackage { ··· 18 17 19 18 useFetchCargoVendor = true; 20 19 cargoHash = "sha256-NxO+7Wh8Ff6RPFtmbEa3EJszfDaZDXGWZDAoXPEAnpI="; 21 - 22 - nativeInstallCheck = [ versionCheckHook ]; 23 - versionCheckProgramArg = "--version"; 24 - doInstallCheck = true; 25 20 26 21 passthru.updateScript = nix-update-script { }; 27 22
+9 -5
pkgs/by-name/so/sou/package.nix
··· 3 3 buildGoModule, 4 4 fetchFromGitHub, 5 5 nix-update-script, 6 - versionCheckHook, 6 + testers, 7 + sou, 7 8 }: 8 9 9 10 buildGoModule (finalAttrs: { ··· 25 26 "-X=main.version=${finalAttrs.version}" 26 27 ]; 27 28 28 - doInstallCheck = true; 29 - nativeInstallCheck = [ versionCheckHook ]; 30 - 31 29 # Some of the tests use localhost networking 32 30 __darwinAllowLocalNetworking = true; 33 31 34 - passthru.updateScript = nix-update-script { }; 32 + passthru = { 33 + updateScript = nix-update-script { }; 34 + tests.version = testers.testVersion { 35 + command = "HOME=$TMPDIR sou --version"; 36 + package = sou; 37 + }; 38 + }; 35 39 36 40 meta = { 37 41 description = "Tool for exploring files in container image layers";
+1 -1
pkgs/by-name/tf/tfmigrate/package.nix
··· 24 24 ]; 25 25 26 26 doInstallCheck = true; 27 - nativeInstallCheck = [ versionCheckHook ]; 27 + nativeInstallCheckInputs = [ versionCheckHook ]; 28 28 29 29 passthru.updateScript = nix-update-script { }; 30 30