From 47fd8c7caf3b06817af12560c551b757f49cd3fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Apr 2024 15:23:22 +0200 Subject: [PATCH 1/2] gitleaks: refactor --- pkgs/tools/security/gitleaks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 1b6e69631c07..08f11f80ef8d 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -12,8 +12,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "zricethezav"; - repo = pname; - rev = "v${version}"; + repo = "gitleaks"; + rev = "refs/tags/v${version}"; hash = "sha256-+UPlknAwmIeXlosHBXl3qPREV186lfDZGZG/Zx1rxYs="; }; @@ -22,7 +22,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/cmd.Version=${version}" + "-X=github.com/zricethezav/gitleaks/v${lib.versions.major version}/cmd.Version=${version}" ]; nativeBuildInputs = [ From 1057efc84a15f41bc3062b5ba4a797019238f163 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Apr 2024 15:24:21 +0200 Subject: [PATCH 2/2] gitleaks: format with nixfmt --- pkgs/tools/security/gitleaks/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 08f11f80ef8d..d5bca2f14f85 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, gitleaks -, installShellFiles -, testers +{ + lib, + buildGoModule, + fetchFromGitHub, + gitleaks, + installShellFiles, + testers, }: buildGoModule rec { @@ -25,9 +26,7 @@ buildGoModule rec { "-X=github.com/zricethezav/gitleaks/v${lib.versions.major version}/cmd.Version=${version}" ]; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; # With v8 the config tests are are blocking doCheck = false;