JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

syft: 0.88.0 -> 0.90.0

Browse Source
This commit is contained in:
kashw2 2023-09-14 23:10:48 +10:00
parent 407c4acda9
commit 2f5ec79c5a
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/tools/admin/syft/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "syft";
version = "0.88.0";
version = "0.90.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
hash = "sha256-A9EYbZigG6TmyYhMjqhpZRaYnR7KzCJpaOBEEaSXWQ4=";
hash = "sha256-W1BLwoqo7sDRZ1LjAbfuuZpoJCWfAK8ekIFwfItkH4A=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -22,7 +22,7 @@ buildGoModule rec {
};
# hash mismatch with darwin
proxyVendor = true;
vendorHash = "sha256-7KL/Z95Gg2Cy6oUIVS8KLS3DvQYcLCZaxgKbtzR1M1U=";
vendorHash = "sha256-TG292RncaL/4kfuM02huEaIAsuUj7vrTre2aFnjqx3Y=";
nativeBuildInputs = [ installShellFiles ];
@ -31,14 +31,14 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X github.com/anchore/syft/internal/version.version=${version}"
"-X github.com/anchore/syft/internal/version.gitDescription=v${version}"
"-X github.com/anchore/syft/internal/version.gitTreeState=clean"
"-X main.version=${version}"
"-X main.gitDescription=v${version}"
"-X main.gitTreeState=clean"
];
preBuild = ''
ldflags+=" -X github.com/anchore/syft/internal/version.gitCommit=$(cat COMMIT)"
ldflags+=" -X github.com/anchore/syft/internal/version.buildDate=$(cat SOURCE_DATE_EPOCH)"
ldflags+=" -X main.gitCommit=$(cat COMMIT)"
ldflags+=" -X main.buildDate=$(cat SOURCE_DATE_EPOCH)"
'';
# tests require a running docker instance

4
pkgs/top-level/all-packages.nix
View File

@ -13654,7 +13654,9 @@ with pkgs;
systrayhelper = callPackage ../tools/misc/systrayhelper { };
syft = callPackage ../tools/admin/syft { };
syft = callPackage ../tools/admin/syft {
buildGoModule = buildGo121Module;
};
Sylk = callPackage ../applications/networking/Sylk { };