From a53ea4159758dc9ba950d9fec848ecf85c4e7520 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 9 Nov 2025 17:00:06 +0100
Subject: [PATCH 1/3] ggshield: 1.40.0 -> 1.44.1

https://github.com/GitGuardian/ggshield/blob/v1.44.1/CHANGELOG.md
---
 pkgs/tools/security/ggshield/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix          | 4 +---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix
index a197f7e3f85c..bbd189258bb0 100644
--- a/pkgs/tools/security/ggshield/default.nix
+++ b/pkgs/tools/security/ggshield/default.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ggshield";
-  version = "1.40.0";
+  version = "1.44.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GitGuardian";
     repo = "ggshield";
     tag = "v${version}";
-    hash = "sha256-Y42MBRyjPljUAGTwhH2FS8drUAceuJse8Qd1GbctWQs=";
+    hash = "sha256-PHCrUzZmpjZMAfKinBYahhwQFjByaIQ/2udSqoGMmdU=";
   };
 
   pythonRelaxDeps = true;
@@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec {
   build-system = with python3.pkgs; [ pdm-backend ];
 
   dependencies = with python3.pkgs; [
-    appdirs
     charset-normalizer
     click
     cryptography
@@ -37,6 +36,8 @@ python3.pkgs.buildPythonApplication rec {
     requests
     rich
     truststore
+    typing-extensions
+    urllib3
   ];
 
   nativeCheckInputs = [
@@ -49,7 +50,7 @@ python3.pkgs.buildPythonApplication rec {
     pytest-mock
     pytest-voluptuous
     pytestCheckHook
-    snapshottest
+    syrupy
     vcrpy
   ]);
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a89aeaffa4e..da478d44ac62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2779,9 +2779,7 @@ with pkgs;
 
   gawkInteractive = gawk.override { interactive = true; };
 
-  ggshield = callPackage ../tools/security/ggshield {
-    python3 = python311;
-  };
+  ggshield = callPackage ../tools/security/ggshield { };
 
   gibberish-detector = with python3Packages; toPythonApplication gibberish-detector;
 

From 09d5435ac28d37ee4ae8d25b90872b71fd03d2be Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 9 Nov 2025 17:05:48 +0100
Subject: [PATCH 2/3] ggshield: fix `meta.changelog`, remove `with lib;`

---
 pkgs/tools/security/ggshield/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix
index bbd189258bb0..1fb187fe69bb 100644
--- a/pkgs/tools/security/ggshield/default.nix
+++ b/pkgs/tools/security/ggshield/default.nix
@@ -81,12 +81,12 @@ python3.pkgs.buildPythonApplication rec {
     "test_get_file_sha_in_ref"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to find and fix various types of hardcoded secrets and infrastructure-as-code misconfigurations";
     homepage = "https://github.com/GitGuardian/ggshield";
-    changelog = "https://github.com/GitGuardian/ggshield/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    changelog = "https://github.com/GitGuardian/ggshield/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ggshield";
   };
 }

From 7660b3d5b6d8a801adfb2623ee42e37ae9a256ca Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 9 Nov 2025 17:11:02 +0100
Subject: [PATCH 3/3] ggshield: move to `pkgs/by-name`

---
 .../ggshield/default.nix => by-name/gg/ggshield/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/ggshield/default.nix => by-name/gg/ggshield/package.nix} (100%)

diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/by-name/gg/ggshield/package.nix
similarity index 100%
rename from pkgs/tools/security/ggshield/default.nix
rename to pkgs/by-name/gg/ggshield/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da478d44ac62..2754ead6e806 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2779,8 +2779,6 @@ with pkgs;
 
   gawkInteractive = gawk.override { interactive = true; };
 
-  ggshield = callPackage ../tools/security/ggshield { };
-
   gibberish-detector = with python3Packages; toPythonApplication gibberish-detector;
 
   gitlab-ee = callPackage ../by-name/gi/gitlab/package.nix {