diff options
Diffstat (limited to 'nixpkgs/pkgs/by-name/gr')
| -rw-r--r-- | nixpkgs/pkgs/by-name/gr/grafana-kiosk/package.nix | 7 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/gr/greenmask/package.nix | 50 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/gr/grype/package.nix | 12 |
5 files changed, 71 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/by-name/gr/grafana-kiosk/package.nix b/nixpkgs/pkgs/by-name/gr/grafana-kiosk/package.nix index 0c1c40ad310c..d9f21655d1cc 100644 --- a/nixpkgs/pkgs/by-name/gr/grafana-kiosk/package.nix +++ b/nixpkgs/pkgs/by-name/gr/grafana-kiosk/package.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, chromium, makeWrapper }: buildGoModule rec { pname = "grafana-kiosk"; @@ -13,6 +13,11 @@ buildGoModule rec { vendorHash = "sha256-sXaxyPNuHDUOkYcWYm94YvJmr1mGe4HdzttWrNSK2Pw="; + nativeBuildInputs = [ makeWrapper ]; + postFixup = '' + wrapProgram $out/bin/grafana-kiosk --prefix PATH : ${lib.makeBinPath [ chromium ]} + ''; + meta = with lib; { description = "Kiosk Utility for Grafana"; homepage = "https://github.com/grafana/grafana-kiosk"; diff --git a/nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json b/nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json index 99d12c5e9322..72a0fa947484 100644 --- a/nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.3.3", + "version": "1.3.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.3.3", + "version": "1.3.4", "hasInstallScript": true, "license": "None", "dependencies": { @@ -211,9 +211,9 @@ } }, "node_modules/ws": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", - "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz", + "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==", "engines": { "node": ">=10.0.0" }, diff --git a/nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix b/nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix index 67872584aadb..df4f95b88bb5 100644 --- a/nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix +++ b/nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,14 +7,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-zNHk80PGsjucoZgKbLn5khQmhgrxKJfldiLJBzF4EXs="; + hash = "sha256-Rc/dj3r3EpMbxx9rYj4kXnstmUGLR46U+7v6n1jSaiQ="; }; - npmDepsHash = "sha256-A/J7CUWtl0Wlv1fJKx1qSub7JhDoZhHsWHAYkcAGy6g="; + npmDepsHash = "sha256-w9d96SMLISPua9LMZscDjL7L8mGPO1RGyNjg8eU40hw="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/nixpkgs/pkgs/by-name/gr/greenmask/package.nix b/nixpkgs/pkgs/by-name/gr/greenmask/package.nix new file mode 100644 index 000000000000..4e5504ce769c --- /dev/null +++ b/nixpkgs/pkgs/by-name/gr/greenmask/package.nix @@ -0,0 +1,50 @@ +{ + lib, + buildGoModule, + coreutils, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "greenmask"; + version = "0.1.14"; + + src = fetchFromGitHub { + owner = "GreenmaskIO"; + repo = "greenmask"; + rev = "refs/tags/v${version}"; + hash = "sha256-R/JJnHBp9MPnq/fIDwYrePIUH3/FvDPFaRpmrpwhU6o="; + }; + + vendorHash = "sha256-WCsZ5DU+mZk9M1lldBY4q2PXI8DDFytPojzGJ6wqXsg="; + + subPackages = [ "cmd/greenmask/" ]; + + ldflags = [ + "-s" + "-w" + "-X=github.com/greenmaskio/greenmask/cmd/greenmask/cmd.Version=${version}" + ]; + + nativeCheckInputs = [ coreutils ]; + + preCheck = '' + substituteInPlace internal/db/postgres/transformers/custom/dynamic_definition_test.go \ + --replace-fail "/bin/echo" "${coreutils}/bin/echo" + + substituteInPlace tests/integration/greenmask/main_test.go \ + --replace-fail "TestTocLibrary" "SkipTestTocLibrary" \ + --replace-fail "TestGreenmaskBackwardCompatibility" "SkipTestGreenmaskBackwardCompatibility" + substituteInPlace tests/integration/storages/main_test.go \ + --replace-fail "TestS3Storage" "SkipTestS3Storage" + ''; + + meta = with lib; { + description = "PostgreSQL database anonymization tool"; + homepage = "https://github.com/GreenmaskIO/greenmask"; + changelog = "https://github.com/GreenmaskIO/greenmask/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "greenmask"; + }; +} diff --git a/nixpkgs/pkgs/by-name/gr/grype/package.nix b/nixpkgs/pkgs/by-name/gr/grype/package.nix index 645c9cadb4fc..25cf7d472839 100644 --- a/nixpkgs/pkgs/by-name/gr/grype/package.nix +++ b/nixpkgs/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.77.1"; + version = "0.77.4"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-Qfoo05MicnQ1shbEV/Rrz9TDrMBDvWBr0U/ZqnlnLTI="; + hash = "sha256-xD6G4DGimmYVVCZHpXlvC24zaRwpRpQ0iRc4Yxac3O8="; # 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; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-lAq1PRElWR0F+OfuSBpR/gnFOptFH33ObR8yd1k7oMk="; + vendorHash = "sha256-WosgdN49MEXSfK42l4em+Cpk8iAQphf9KOhY0mgBQ7U="; nativeBuildInputs = [ installShellFiles ]; @@ -90,6 +90,8 @@ buildGoModule rec { --replace-fail "TestAllNames" "SkipAllNames" substituteInPlace test/cli/version_cmd_test.go \ --replace-fail "TestVersionCmdPrintsToStdout" "SkipVersionCmdPrintsToStdout" + substituteInPlace grype/presenter/sarif/presenter_test.go \ + --replace-fail "Test_SarifIsValid" "SkipTest_SarifIsValid" # segfault rm grype/db/v5/namespace/cpe/namespace_test.go @@ -103,10 +105,9 @@ buildGoModule rec { ''; meta = with lib; { + description = "Vulnerability scanner for container images and filesystems"; homepage = "https://github.com/anchore/grype"; changelog = "https://github.com/anchore/grype/releases/tag/v${version}"; - description = "Vulnerability scanner for container images and filesystems"; - mainProgram = "grype"; longDescription = '' As a vulnerability scanner grype is able to scan the contents of a container image or filesystem to find known vulnerabilities. @@ -117,5 +118,6 @@ buildGoModule rec { jk kashw2 ]; + mainProgram = "grype"; }; } |