Unverified Commit fbf567ce authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

treewide: fix versionCheckHook in nativeInstallCheck (#399584)

parents 9fa9c157 93095a5b
Loading
Loading
Loading
Loading
+9 −6
Original line number Diff line number Diff line
@@ -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";
+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  buildInputs = [ openssl ];

  doInstallCheck = true;
  nativeInstallCheck = [ versionCheckHook ];
  nativeInstallCheckInputs = [ versionCheckHook ];

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

+1 −1
Original line number Diff line number Diff line
@@ -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";
+0 −5
Original line number Diff line number Diff line
@@ -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 =
      {
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
  doCheck = true;

  doInstallCheck = true;
  nativeInstallCheck = [ versionCheckHook ];
  nativeInstallCheckInputs = [ versionCheckHook ];

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