From 193552e62890d4e4ca24bac0f97e2757a0e36841 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 May 2026 22:54:17 +0200 Subject: [PATCH] ggshield: 1.45.0 -> 1.50.4 https://github.com/GitGuardian/ggshield/releases/tag/v1.50.4 --- pkgs/by-name/gg/ggshield/package.nix | 33 +++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gg/ggshield/package.nix b/pkgs/by-name/gg/ggshield/package.nix index 37cfa29dbd9e..a7b8562d06d4 100644 --- a/pkgs/by-name/gg/ggshield/package.nix +++ b/pkgs/by-name/gg/ggshield/package.nix @@ -5,28 +5,48 @@ python3, }: -python3.pkgs.buildPythonApplication (finalAttrs: { +let + py = python3.override { + packageOverrides = self: super: { + + # Doesn't support latest marshmallow + marshmallow = super.marshmallow.overridePythonAttrs (oldAttrs: rec { + version = "3.26.2"; + src = fetchFromGitHub { + owner = "marshmallow-code"; + repo = "marshmallow"; + tag = version; + hash = "sha256-ioe+aZHOW8r3wF3UknbTjAP0dEggd/NL9PTkPVQ46zM="; + }; + }); + }; + }; +in + +py.pkgs.buildPythonApplication (finalAttrs: { pname = "ggshield"; - version = "1.45.0"; + version = "1.50.4"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; tag = "v${finalAttrs.version}"; - hash = "sha256-9UjdAnDcUxs/2pdhnJYncw2NBPiLpxUL5T74qbX5AcY="; + hash = "sha256-wwGj7i1GoxNzdfUhcL7mulgQAPtz5WhbT67hgbcMxpo="; }; pythonRelaxDeps = true; - build-system = with python3.pkgs; [ pdm-backend ]; + build-system = with py.pkgs; [ hatchling ]; - dependencies = with python3.pkgs; [ + dependencies = with py.pkgs; [ charset-normalizer click cryptography + keyring marshmallow marshmallow-dataclass + notify-py oauthlib platformdirs pygitguardian @@ -35,6 +55,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pyyaml requests rich + sigstore truststore typing-extensions urllib3 @@ -43,7 +64,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { nativeCheckInputs = [ git ] - ++ (with python3.pkgs; [ + ++ (with py.pkgs; [ jsonschema pyfakefs pytest-factoryboy