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
diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix
index b45c1ac58d24..64d46ce9d32f 100644
--- a/pkgs/development/python-modules/pygitguardian/default.nix
+++ b/pkgs/development/python-modules/pygitguardian/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pygitguardian";
-  version = "1.28.0";
+  version = "1.30.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GitGuardian";
     repo = "py-gitguardian";
     tag = "v${version}";
-    hash = "sha256-56Z0peJcjBbNX51MLLaIKcD9Qg+5q+5I0gKRu84/8TM=";
+    hash = "sha256-8kKTqthpkH3A5secb8TqbM+/twA77R81y80MOPNQZPA=";
   };
 
   pythonRelaxDeps = [
@@ -56,5 +56,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/GitGuardian/py-gitguardian/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
+    # https://github.com/GitGuardian/py-gitguardian/issues/167
+    broken = lib.versionAtLeast marshmallow.version "4";
   };
 }