From 5c04ea5ccd3afd94125c51eddb01566a592b47fc Mon Sep 17 00:00:00 2001 From: ocfox Date: Sun, 9 Apr 2023 01:13:01 +0800 Subject: pip-audit: 2.4.12 -> 2.5.4 (#224590) Co-authored-by: Fabian Affolter --- pkgs/development/tools/pip-audit/default.nix | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 7d6e986ff13..e4bdb4b673d 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -1,21 +1,18 @@ { lib , fetchFromGitHub -, fetchpatch , python3 }: - let py = python3.override { packageOverrides = self: super: { - # ansible doesn't support resolvelib > 0.6.0 and can't have an override - resolvelib = super.resolvelib.overridePythonAttrs (oldAttrs: rec { - version = "0.8.1"; + cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec { + version = "2.7.1"; src = fetchFromGitHub { - owner = "sarugaku"; - repo = "resolvelib"; - rev = version; - sha256 = "1qpd0gg9yl0kbamlgjs9pkxd39kx511kbc92civ77v0ka5sw8ca0"; + owner = "CycloneDX"; + repo = "cyclonedx-python-lib"; + rev = "v${version}"; + hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk="; }; }); }; @@ -25,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "pip-audit"; - version = "2.4.12"; + version = "2.5.4"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bpAs7xXWvBVGzbX6Fij71BnEMpqYjSSCtWjuA/EFms8="; + hash = "sha256-aByzVPQADTNz5rVzmkNH/zk4u+RkWPcfk0sQhR3K2cQ="; }; nativeBuildInputs = [ @@ -43,14 +40,12 @@ buildPythonApplication rec { cachecontrol cyclonedx-python-lib html5lib - lockfile packaging pip-api pip-requirements-parser - progress - resolvelib rich - ]; + toml + ] ++ cachecontrol.optional-dependencies.filecache; nativeCheckInputs = [ pretend @@ -68,7 +63,6 @@ buildPythonApplication rec { disabledTestPaths = [ # Tests require network access "test/dependency_source/test_requirement.py" - "test/dependency_source/resolvelib/test_resolvelib.py" "test/service/test_pypi.py" "test/service/test_osv.py" ]; -- cgit 1.4.1