Skip to content

Commit fbf567c

Browse files
authored
treewide: fix versionCheckHook in nativeInstallCheck (#399584)
2 parents 9fa9c15 + 93095a5 commit fbf567c

File tree

8 files changed

+22
-25
lines changed

8 files changed

+22
-25
lines changed

pkgs/by-name/az/az-pim-cli/package.nix

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
installShellFiles,
66
stdenv,
77
buildPackages,
8-
versionCheckHook,
98
nix-update-script,
9+
testers,
10+
az-pim-cli,
1011
}:
1112
buildGoModule (finalAttrs: {
1213
pname = "az-pim-cli";
@@ -37,11 +38,13 @@ buildGoModule (finalAttrs: {
3738
''
3839
);
3940

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+
};
4548

4649
meta = {
4750
description = "List and activate Azure Entra ID Privileged Identity Management roles from the CLI";

pkgs/by-name/fo/foodfetch/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
2525
buildInputs = [ openssl ];
2626

2727
doInstallCheck = true;
28-
nativeInstallCheck = [ versionCheckHook ];
28+
nativeInstallCheckInputs = [ versionCheckHook ];
2929

3030
passthru.updateScript = nix-update-script { };
3131

pkgs/by-name/kr/krep/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
2727

2828
doCheck = true;
2929
doInstallCheck = true;
30-
nativeInstallCheck = [ versionCheckHook ];
30+
nativeInstallCheckInputs = [ versionCheckHook ];
3131

3232
meta = {
3333
description = "Blazingly fast string search utility designed for performance-critical applications";

pkgs/by-name/ol/ollama/package.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
cudaArches ? cudaPackages.cudaFlags.realArches or [ ],
2020
darwin,
2121
autoAddDriverRunpath,
22-
versionCheckHook,
2322

2423
# passthru
2524
nixosTests,
@@ -247,10 +246,6 @@ goBuild {
247246

248247
__darwinAllowLocalNetworking = true;
249248

250-
nativeInstallCheck = [ versionCheckHook ];
251-
versionCheckProgramArg = "--version";
252-
doInstallCheck = true;
253-
254249
passthru = {
255250
tests =
256251
{

pkgs/by-name/pe/petidomo/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
3232
doCheck = true;
3333

3434
doInstallCheck = true;
35-
nativeInstallCheck = [ versionCheckHook ];
35+
nativeInstallCheckInputs = [ versionCheckHook ];
3636

3737
meta = {
3838
homepage = "https://petidomo.sourceforge.net/";

pkgs/by-name/ru/rust-stakeholder/package.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
lib,
33
fetchFromGitHub,
44
rustPlatform,
5-
versionCheckHook,
65
nix-update-script,
76
}:
87
rustPlatform.buildRustPackage {
@@ -19,10 +18,6 @@ rustPlatform.buildRustPackage {
1918
useFetchCargoVendor = true;
2019
cargoHash = "sha256-NxO+7Wh8Ff6RPFtmbEa3EJszfDaZDXGWZDAoXPEAnpI=";
2120

22-
nativeInstallCheck = [ versionCheckHook ];
23-
versionCheckProgramArg = "--version";
24-
doInstallCheck = true;
25-
2621
passthru.updateScript = nix-update-script { };
2722

2823
meta = {

pkgs/by-name/so/sou/package.nix

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
buildGoModule,
44
fetchFromGitHub,
55
nix-update-script,
6-
versionCheckHook,
6+
testers,
7+
sou,
78
}:
89

910
buildGoModule (finalAttrs: {
@@ -25,13 +26,16 @@ buildGoModule (finalAttrs: {
2526
"-X=main.version=${finalAttrs.version}"
2627
];
2728

28-
doInstallCheck = true;
29-
nativeInstallCheck = [ versionCheckHook ];
30-
3129
# Some of the tests use localhost networking
3230
__darwinAllowLocalNetworking = true;
3331

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+
};
3539

3640
meta = {
3741
description = "Tool for exploring files in container image layers";

pkgs/by-name/tf/tfmigrate/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
2424
];
2525

2626
doInstallCheck = true;
27-
nativeInstallCheck = [ versionCheckHook ];
27+
nativeInstallCheckInputs = [ versionCheckHook ];
2828

2929
passthru.updateScript = nix-update-script { };
3030

0 commit comments

Comments
 (0)