From 34fb736d75221c881897cac4d7c102189b8c1886 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 10:20:34 +0000 Subject: [PATCH 1/2] gitleaks: 8.21.2 -> 8.22.0 --- pkgs/by-name/gi/gitleaks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index fa17828c303c..adfdf7a7eccc 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.21.2"; + version = "8.22.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; rev = "refs/tags/v${version}"; - hash = "sha256-1MCSGFpjYD4XdES+kJTz/NTN/B00TWMQ1Rmk/nsKf2Q="; + hash = "sha256-f3dSKYRkXt/YT5PgFS7pclRcKvfGl2sFopqfJkEwnhw="; }; - vendorHash = "sha256-iIgS0fXdiVMYKr3FZTYlCSEqqaH9sxZh1MFry9pGET8="; + vendorHash = "sha256-qjchUWWnG2CYXTM4aGkh+UgaJuPQ6yEpetXJ5ORqNuE="; ldflags = [ "-s" From 080f38599bd7472151df6e1d811efde8a15f69a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Dec 2024 21:28:28 +0100 Subject: [PATCH 2/2] gitleaks: migrate to versionCheckHook --- pkgs/by-name/gi/gitleaks/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index adfdf7a7eccc..063e64e2b333 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -5,8 +5,8 @@ fetchFromGitHub, gitleaks, installShellFiles, - testers, nix-update-script, + versionCheckHook, }: buildGoModule rec { @@ -28,7 +28,10 @@ buildGoModule rec { "-X=github.com/zricethezav/gitleaks/v${lib.versions.major version}/cmd.Version=${version}" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + versionCheckHook + ]; # With v8 the config tests are blocking doCheck = false; @@ -40,10 +43,7 @@ buildGoModule rec { --zsh <($out/bin/${pname} completion zsh) ''; - passthru.tests.version = testers.testVersion { - package = gitleaks; - command = "${pname} version"; - }; + doInstallCheck = true; passthru.updateScript = nix-update-script { };