diff options
Diffstat (limited to 'pkgs/by-name/gr')
-rw-r--r-- | pkgs/by-name/gr/gr-framework/package.nix | 70 | ||||
-rw-r--r-- | pkgs/by-name/gr/gr-framework/patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch | 25 | ||||
-rw-r--r-- | pkgs/by-name/gr/grafana-alloy/package.nix | 127 | ||||
-rw-r--r-- | pkgs/by-name/gr/grafana-kiosk/package.nix | 13 | ||||
-rw-r--r-- | pkgs/by-name/gr/grafana-reporter/package.nix | 41 | ||||
-rw-r--r-- | pkgs/by-name/gr/graphicsmagick/imagemagick-compat.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/gr/graphite-cli/package-lock.json | 35 | ||||
-rw-r--r-- | pkgs/by-name/gr/graphite-cli/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/gr/graphqlmaker/package.nix | 33 | ||||
-rw-r--r-- | pkgs/by-name/gr/greenmask/package.nix | 50 | ||||
-rw-r--r-- | pkgs/by-name/gr/grimblast/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/gr/grun/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/gr/gruvbox-gtk-theme/package.nix | 38 | ||||
-rw-r--r-- | pkgs/by-name/gr/gruvbox-plus-icons/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/gr/grype/package.nix | 17 |
15 files changed, 402 insertions, 63 deletions
diff --git a/pkgs/by-name/gr/gr-framework/package.nix b/pkgs/by-name/gr/gr-framework/package.nix new file mode 100644 index 0000000000000..533391a9504e4 --- /dev/null +++ b/pkgs/by-name/gr/gr-framework/package.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script +, qt5 + +, cmake + +, cairo +, ffmpeg +, freetype +, ghostscript +, glfw +, libjpeg +, libtiff +, qhull +, xorg +, zeromq +}: + +stdenv.mkDerivation rec { + pname = "gr-framework"; + version = "0.73.5"; + + src = fetchFromGitHub { + owner = "sciapp"; + repo = "gr"; + rev = "v${version}"; + hash = "sha256-9Py2r774GaUXWhF3yO3ceT1rPi/uqMVZVAo0xs9n+I0="; + }; + + patches = [ + ./patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch + ]; + + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + cairo + ffmpeg + freetype + ghostscript + glfw + libjpeg + libtiff + qhull + qt5.qtbase + xorg.libX11 + xorg.libXft + xorg.libXt + zeromq + ]; + + preConfigure = '' + echo ${version} > version.txt + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "GR framework is a graphics library for visualisation applications"; + homepage = "https://gr-framework.org"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ paveloom ]; + }; +} diff --git a/pkgs/by-name/gr/gr-framework/patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch b/pkgs/by-name/gr/gr-framework/patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch new file mode 100644 index 0000000000000..41fdcd5ae72be --- /dev/null +++ b/pkgs/by-name/gr/gr-framework/patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch @@ -0,0 +1,25 @@ +From 78a86da95c7227cbfd0f3073841df5409a576837 Mon Sep 17 00:00:00 2001 +From: Pavel Sobolev <paveloomm@gmail.com> +Date: Wed, 31 Jan 2024 16:50:36 +0000 +Subject: [PATCH] Use the module mode to search for the `LibXml2` package. + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5f865a5b..5550b493 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,7 +117,7 @@ if(GR_USE_BUNDLED_LIBRARIES) + # (`ONLY_CMAKE_FIND_ROOT_PATH` option is not inherited to `find_package` calls within the LibXml2 config file) + find_package(LibXml2 NO_MODULE ONLY_CMAKE_FIND_ROOT_PATH) + else() +- find_package(LibXml2 NO_MODULE) ++ find_package(LibXml2 MODULE) + endif() + + # Find the following packages only in 3rdparty, if `GR_USE_BUNDLED_LIBRARIES` is set +-- +2.42.0 + diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix new file mode 100644 index 0000000000000..66d6f632bcbe5 --- /dev/null +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -0,0 +1,127 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, buildGoModule +, systemd +, yarn +, fixup-yarn-lock +, nodejs +, grafana-alloy +, nixosTests +, nix-update-script +, installShellFiles +, testers +}: + +buildGoModule rec { + pname = "grafana-alloy"; + version = "1.1.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "grafana"; + repo = "alloy"; + hash = "sha256-jaOQG+QkVi10lUp6izvSGE9j76ULc4yKbxdDhLHykYI="; + }; + + proxyVendor = true; + vendorHash = "sha256-6Xc2siImM1Dl716uGhtAGcn+PO2OLuYLxanzg8Ho6SA="; + + nativeBuildInputs = [ fixup-yarn-lock yarn nodejs installShellFiles ]; + + ldflags = + let + prefix = "github.com/grafana/alloy/internal/build"; + in + [ + "-s" + "-w" + # https://github.com/grafana/alloy/blob/3201389252d2c011bee15ace0c9f4cdbcb978f9f/Makefile#L110 + "-X ${prefix}.Branch=v${version}" + "-X ${prefix}.Version=${version}" + "-X ${prefix}.Revision=v${version}" + "-X ${prefix}.BuildUser=nix" + "-X ${prefix}.BuildDate=1970-01-01T00:00:00Z" + ]; + + tags = [ + "netgo" + "builtinassets" + "promtail_journal_enabled" + ]; + + subPackages = [ + "." + ]; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/internal/web/ui/yarn.lock"; + sha256 = "sha256-o3vCI9GHCr4SjYsiT0wQ4mN76QeAGwOfLVCzGp7NMf4="; + }; + + preBuild = '' + pushd internal/web/ui + + # Yarn wants a real home directory to write cache, config, etc to + export HOME=$NIX_BUILD_TOP/fake_home + + fixup-yarn-lock yarn.lock + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + + patchShebangs node_modules/ + + yarn --offline build + + popd + ''; + + # uses go-systemd, which uses libsystemd headers + # https://github.com/coreos/go-systemd/issues/351 + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isLinux [ "-I${lib.getDev systemd}/include" ]; + + checkFlags = [ + "-tags nonetwork" # disable network tests + "-tags nodocker" # disable docker tests + ]; + + # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at + # runtime. + # Add to RUNPATH so it can be found. + postFixup = lib.optionalString stdenv.isLinux '' + patchelf \ + --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/alloy)" \ + $out/bin/alloy + ''; + + postInstall = '' + installShellCompletion --cmd alloy \ + --bash <($out/bin/alloy completion bash) \ + --fish <($out/bin/alloy completion fish) \ + --zsh <($out/bin/alloy completion zsh) + ''; + + passthru = { + tests = { + inherit (nixosTests) alloy; + version = testers.testVersion { + version = "v${version}"; + command = "${lib.getExe grafana-alloy} --version"; + package = grafana-alloy; + }; + }; + updateScript = nix-update-script { }; + # alias for nix-update to be able to find and update this attribute + offlineCache = yarnOfflineCache; + }; + + meta = with lib; { + description = "Open source OpenTelemetry Collector distribution with built-in Prometheus pipelines and support for metrics, logs, traces, and profiles"; + mainProgram = "alloy"; + license = licenses.asl20; + homepage = "https://grafana.com/oss/alloy"; + maintainers = with maintainers; [ flokli emilylange hbjydev ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/gr/grafana-kiosk/package.nix b/pkgs/by-name/gr/grafana-kiosk/package.nix index 0c1c40ad310c8..452ec1977a9ff 100644 --- a/pkgs/by-name/gr/grafana-kiosk/package.nix +++ b/pkgs/by-name/gr/grafana-kiosk/package.nix @@ -1,17 +1,22 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, chromium, makeWrapper }: buildGoModule rec { pname = "grafana-kiosk"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-kiosk"; rev = "v${version}"; - hash = "sha256-KXEbhRFD++VeVI1Fbrai+IYb3lyGKs+plYPoKIZD0JM="; + hash = "sha256-JTz3EaedJFWE3YqsBLjKH4hWI7+dNeMlp0sZ2kW8IR8="; }; - vendorHash = "sha256-sXaxyPNuHDUOkYcWYm94YvJmr1mGe4HdzttWrNSK2Pw="; + vendorHash = "sha256-8sxfbSj0Jq5f0oJoe8PtP72PDWvLzgOeRiP7I/Pfam4="; + + nativeBuildInputs = [ makeWrapper ]; + postFixup = '' + wrapProgram $out/bin/grafana-kiosk --prefix PATH : ${lib.makeBinPath [ chromium ]} + ''; meta = with lib; { description = "Kiosk Utility for Grafana"; diff --git a/pkgs/by-name/gr/grafana-reporter/package.nix b/pkgs/by-name/gr/grafana-reporter/package.nix new file mode 100644 index 0000000000000..309ce2ecba03e --- /dev/null +++ b/pkgs/by-name/gr/grafana-reporter/package.nix @@ -0,0 +1,41 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, tetex +, makeWrapper +}: +buildGoModule rec { + pname = "reporter"; + version = "2.3.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "IzakMarais"; + repo = "reporter"; + sha256 = "sha256-lsraJwx56I2Gn8CePWUlQu1qdMp78P4xwPzLxetYUcw="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + vendorHash = null; + + postPatch = '' + go mod init github.com/IzakMarais/reporter + ''; + + postInstall = '' + wrapProgram $out/bin/grafana-reporter \ + --prefix PATH : ${lib.makeBinPath [ tetex ]} + ''; + + # Testing library used had a breaking API change and upstream didn't adapt. + doCheck = false; + + meta = { + description = "PDF report generator from a Grafana dashboard"; + mainProgram = "grafana-reporter"; + homepage = "https://github.com/IzakMarais/reporter"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.disassembler ]; + }; +} diff --git a/pkgs/by-name/gr/graphicsmagick/imagemagick-compat.nix b/pkgs/by-name/gr/graphicsmagick/imagemagick-compat.nix index 9e278da037bc8..4d25a2aa0e112 100644 --- a/pkgs/by-name/gr/graphicsmagick/imagemagick-compat.nix +++ b/pkgs/by-name/gr/graphicsmagick/imagemagick-compat.nix @@ -43,6 +43,6 @@ stdenvNoCC.mkDerivation { ''; meta = graphicsmagick.meta // { - description = "A repack of GraphicsMagick that provides compatibility with ImageMagick interfaces"; + description = "Repack of GraphicsMagick that provides compatibility with ImageMagick interfaces"; }; } diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index 99d12c5e93229..c90f63c8c10b1 100644 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.3.3", + "version": "1.3.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.3.3", + "version": "1.3.9", "hasInstallScript": true, "license": "None", "dependencies": { @@ -126,17 +126,6 @@ "node": ">=8" } }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -146,12 +135,9 @@ } }, "node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dependencies": { - "lru-cache": "^6.0.0" - }, + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", "bin": { "semver": "bin/semver.js" }, @@ -211,9 +197,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.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "engines": { "node": ">=10.0.0" }, @@ -238,11 +224,6 @@ "node": ">=10" } }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, "node_modules/yargs": { "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index 67872584aadb7..3c81f17f0183f 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,14 +7,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.3.3"; + version = "1.3.9"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-zNHk80PGsjucoZgKbLn5khQmhgrxKJfldiLJBzF4EXs="; + hash = "sha256-HbS1hHnlyptXEGy6Qs2Iq/bUUEXYJPc55FEYBjyBvVs="; }; - npmDepsHash = "sha256-A/J7CUWtl0Wlv1fJKx1qSub7JhDoZhHsWHAYkcAGy6g="; + npmDepsHash = "sha256-iVDa8Y/32J7qFWp/jlKwNiepmpfUZV56xNwxILUayMo="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/gr/graphqlmaker/package.nix b/pkgs/by-name/gr/graphqlmaker/package.nix new file mode 100644 index 0000000000000..265b63112dfe5 --- /dev/null +++ b/pkgs/by-name/gr/graphqlmaker/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "graphqlmaker"; + version = "0-unstable-2024-05-18"; + + src = fetchFromGitHub { + owner = "xssdoctor"; + repo = "graphqlMaker"; + rev = "ff884ce39156d8458da35c0b0b5d7eb1e1146bb5"; + hash = "sha256-H3AFCS1WoeVXUdXBV1JKrGIraJP/ql6XG++PxmWUico="; + }; + + vendorHash = "sha256-1mDOqTsQ3kHs3MEWlRcdqhjIRul7um2mfBAxObhoSlE="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Tool to find graphql queries in Javascript files"; + homepage = "https://github.com/xssdoctor/graphqlMaker"; + # https://github.com/xssdoctor/graphqlMaker/issues/1 + license = licenses.unfree; + maintainers = with maintainers; [ fab ]; + mainProgram = "graphqlMaker"; + }; +} diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix new file mode 100644 index 0000000000000..4e5504ce769c1 --- /dev/null +++ b/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/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index 9f0d29ff74a2d..bd6c6301a1d0e 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "A helper for screenshots within Hyprland, based on grimshot"; + description = "Helper for screenshots within Hyprland, based on grimshot"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ donovanglover ]; diff --git a/pkgs/by-name/gr/grun/package.nix b/pkgs/by-name/gr/grun/package.nix index 54b6a5715ddbb..145eba0a6539f 100644 --- a/pkgs/by-name/gr/grun/package.nix +++ b/pkgs/by-name/gr/grun/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ]; meta = { - description = "An application launcher written in C and using GTK for the interface"; + description = "Application launcher written in C and using GTK for the interface"; mainProgram = "grun"; homepage = "https://github.com/lrgc/grun"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index 042f23bebba35..cba18f06de6d8 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -1,27 +1,24 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, gnome-themes-extra -, gtk-engine-murrine +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gnome-themes-extra, + gtk-engine-murrine, }: stdenvNoCC.mkDerivation { pname = "gruvbox-gtk-theme"; - version = "unstable-2023-05-28"; + version = "0-unstable-2024-06-12"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "c0b7fb501938241a3b6b5734f8cb1f0982edc6b4"; - hash = "sha256-Y+6HuWaVkNqlYc+w5wLkS2LpKcDtpeOpdHnqBmShm5Q="; + rev = "1a0f6672283e1846ec307addd4647f2daad29402"; + hash = "sha256-bbL4bHAdkmReogUQML9sMpSallZ7wrgbK3R64xiAYRo="; }; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - buildInputs = [ - gnome-themes-extra - ]; + buildInputs = [ gnome-themes-extra ]; dontBuild = true; @@ -32,11 +29,14 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - meta = with lib; { - description = "A Gtk theme based on the Gruvbox colour pallete"; + meta = { + description = "Gtk theme based on the Gruvbox colour pallete"; homepage = "https://www.pling.com/p/1681313/"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = [ maintainers.math-42 ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + math-42 + ]; }; } diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix index 7525953259311..e244c4856f30c 100644 --- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix +++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "gruvbox-plus-icons"; - version = "5.3.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "SylEleuth"; repo = "gruvbox-plus-icon-pack"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Y+wNmZTVWsg6Hn+fak71jnoZ72Cz/8YYpGWkKr4+C9Q="; + sha256 = "sha256-mtOYoaejK6ZGPcM4IxXs6l6oXGP9WSMw5N7JIF3n67s="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 645c9cadb4fce..dd851078933cc 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.77.1"; + version = "0.79.0"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-Qfoo05MicnQ1shbEV/Rrz9TDrMBDvWBr0U/ZqnlnLTI="; + hash = "sha256-fFiZ6GOKaHcBnxakhd3Mdm1hHmfAwyq/ScBNUwrm0vw="; # 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-PIs+6P7w6vjOOpH96KEdG6tHRCU7ijtdyS/1C77BPDw="; nativeBuildInputs = [ installShellFiles ]; @@ -90,6 +90,13 @@ 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" + + # May fail on NixOS, probably due bug in how syft handles tmpfs. + # See https://github.com/anchore/grype/issues/1822 + substituteInPlace grype/distro/distro_test.go \ + --replace-fail "Test_NewDistroFromRelease_Coverage" "SkipTest_NewDistroFromRelease_Coverage" # segfault rm grype/db/v5/namespace/cpe/namespace_test.go @@ -103,10 +110,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 +123,6 @@ buildGoModule rec { jk kashw2 ]; + mainProgram = "grype"; }; } |