From b39b054e736864bc3a85230583873005af4cffe5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 01:10:19 +0000 Subject: [PATCH 1/3] cyclonedx-gomod: 1.6.0 -> 1.7.0 --- pkgs/tools/security/cyclonedx-gomod/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cyclonedx-gomod/default.nix b/pkgs/tools/security/cyclonedx-gomod/default.nix index 1a00303ac96f..612dc28387d5 100644 --- a/pkgs/tools/security/cyclonedx-gomod/default.nix +++ b/pkgs/tools/security/cyclonedx-gomod/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cyclonedx-gomod"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - hash = "sha256-3YHlh7edRWU8plAJh96RDkrC9YUQjvV4vNGOxmbS0sA="; + hash = "sha256-RM8ZH1mO+72ptoU7YKXlCZAyDhYZ7MFXyDYrqBQwsDI="; }; - vendorHash = "sha256-0Fx9pOofcY5rpX6DU2xPeg7xEZ8ows/DWwyV5B7LHGY="; + vendorHash = "sha256-1ibMneSOYs5C6Ul8m/rVXVFBJHZrH1D5eWRwVVJ6a+A="; # Tests require network access and cyclonedx executable doCheck = false; From bb9810731bd5a6f693e6aa3d2cc9b4859d249224 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Apr 2024 10:57:33 +0200 Subject: [PATCH 2/3] cyclonedx-gomod: refactor --- pkgs/tools/security/cyclonedx-gomod/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cyclonedx-gomod/default.nix b/pkgs/tools/security/cyclonedx-gomod/default.nix index 612dc28387d5..48e07aff522b 100644 --- a/pkgs/tools/security/cyclonedx-gomod/default.nix +++ b/pkgs/tools/security/cyclonedx-gomod/default.nix @@ -9,13 +9,18 @@ buildGoModule rec { src = fetchFromGitHub { owner = "CycloneDX"; - repo = pname; - rev = "v${version}"; + repo = "cyclonedx-gomod"; + rev = "refs/tags/v${version}"; hash = "sha256-RM8ZH1mO+72ptoU7YKXlCZAyDhYZ7MFXyDYrqBQwsDI="; }; vendorHash = "sha256-1ibMneSOYs5C6Ul8m/rVXVFBJHZrH1D5eWRwVVJ6a+A="; + ldflags = [ + "-w" + "-s" + ]; + # Tests require network access and cyclonedx executable doCheck = false; From cf05886e365a89a6c59a44d6554263b20ae2f496 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Apr 2024 10:57:55 +0200 Subject: [PATCH 3/3] cyclonedx-gomod: format with nixfmt --- pkgs/tools/security/cyclonedx-gomod/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cyclonedx-gomod/default.nix b/pkgs/tools/security/cyclonedx-gomod/default.nix index 48e07aff522b..2a27f7b6a35b 100644 --- a/pkgs/tools/security/cyclonedx-gomod/default.nix +++ b/pkgs/tools/security/cyclonedx-gomod/default.nix @@ -1,6 +1,7 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec {