diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/by-name/gg/ggshield/package.nix similarity index 87% rename from pkgs/tools/security/ggshield/default.nix rename to pkgs/by-name/gg/ggshield/package.nix index a197f7e3f85c..1fb187fe69bb 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/by-name/gg/ggshield/package.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 ]); @@ -80,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"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 301042a79e1b..071d97ad1b4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2757,10 +2757,6 @@ with pkgs; gawkInteractive = gawk.override { interactive = true; }; - ggshield = callPackage ../tools/security/ggshield { - python3 = python311; - }; - gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; gitlab-ee = callPackage ../by-name/gi/gitlab/package.nix {