treewide: fix versionCheckHook in nativeInstallCheck (#399584)
This commit is contained in:
@@ -5,8 +5,9 @@
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
buildPackages,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
testers,
|
||||
az-pim-cli,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "az-pim-cli";
|
||||
@@ -37,11 +38,13 @@ buildGoModule (finalAttrs: {
|
||||
''
|
||||
);
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheck = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
command = "HOME=$TMPDIR az-pim-cli --version";
|
||||
package = az-pim-cli;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "List and activate Azure Entra ID Privileged Identity Management roles from the CLI";
|
||||
|
||||
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheck = [ versionCheckHook ];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doCheck = true;
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheck = [ versionCheckHook ];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Blazingly fast string search utility designed for performance-critical applications";
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
cudaArches ? cudaPackages.cudaFlags.realArches or [ ],
|
||||
darwin,
|
||||
autoAddDriverRunpath,
|
||||
versionCheckHook,
|
||||
|
||||
# passthru
|
||||
nixosTests,
|
||||
@@ -247,10 +246,6 @@ goBuild {
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeInstallCheck = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
tests =
|
||||
{
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
doCheck = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheck = [ versionCheckHook ];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://petidomo.sourceforge.net/";
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
@@ -19,10 +18,6 @@ rustPlatform.buildRustPackage {
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-NxO+7Wh8Ff6RPFtmbEa3EJszfDaZDXGWZDAoXPEAnpI=";
|
||||
|
||||
nativeInstallCheck = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
testers,
|
||||
sou,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -25,13 +26,16 @@ buildGoModule (finalAttrs: {
|
||||
"-X=main.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheck = [ versionCheckHook ];
|
||||
|
||||
# Some of the tests use localhost networking
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
command = "HOME=$TMPDIR sou --version";
|
||||
package = sou;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Tool for exploring files in container image layers";
|
||||
|
||||
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheck = [ versionCheckHook ];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user