From 3533c05bac7e4d0188077a6b201d16372a3a897e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 May 2024 08:43:43 +0200 Subject: [PATCH 1/3] pip-audit: 2.7.2 -> 2.7.3 Diff: https://github.com/trailofbits/pip-audit/compare/refs/tags/v2.7.2...v2.7.3 Changelog: https://github.com/pypa/pip-audit/releases/tag/v2.7.3 --- pkgs/development/tools/pip-audit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 6adcf5529e56..72127236efd6 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.7.2"; + version = "2.7.3"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IlIPLuHGmnmt6FgX+Psw+f6XpkuhP+BZ+e4k4DV8e/U="; + hash = "sha256-MRFfF5OygUCIdUnPvxhYk4IcLSWGgmlw2qgzPoZDniw="; }; nativeBuildInputs = with python3.pkgs; [ From 501cb1c73ef0588376e4637ee0b0a83b886e1e59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 May 2024 08:45:55 +0200 Subject: [PATCH 2/3] pip-audit: refactor --- pkgs/development/tools/pip-audit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 72127236efd6..31e7fd968f8f 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -10,16 +10,16 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "trailofbits"; - repo = pname; + repo = "pip-audit"; rev = "refs/tags/v${version}"; hash = "sha256-MRFfF5OygUCIdUnPvxhYk4IcLSWGgmlw2qgzPoZDniw="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ flit-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ cachecontrol cyclonedx-python-lib html5lib @@ -60,10 +60,10 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool for scanning Python environments for known vulnerabilities"; - mainProgram = "pip-audit"; homepage = "https://github.com/trailofbits/pip-audit"; changelog = "https://github.com/pypa/pip-audit/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "pip-audit"; }; } From cbd791724bf847b97c65cd3a57feb633dd13fc55 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 May 2024 08:46:21 +0200 Subject: [PATCH 3/3] pip-audit: format with nixfmt --- pkgs/development/tools/pip-audit/default.nix | 38 ++++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 31e7fd968f8f..9deb33c757f4 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -15,29 +16,28 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-MRFfF5OygUCIdUnPvxhYk4IcLSWGgmlw2qgzPoZDniw="; }; - build-system = with python3.pkgs; [ - flit-core - ]; + build-system = with python3.pkgs; [ flit-core ]; - dependencies = with python3.pkgs; [ - cachecontrol - cyclonedx-python-lib - html5lib - packaging - pip-api - pip-requirements-parser - rich - toml - ] ++ cachecontrol.optional-dependencies.filecache; + dependencies = + with python3.pkgs; + [ + cachecontrol + cyclonedx-python-lib + html5lib + packaging + pip-api + pip-requirements-parser + rich + toml + ] + ++ cachecontrol.optional-dependencies.filecache; nativeCheckInputs = with python3.pkgs; [ pretend pytestCheckHook ]; - pythonImportsCheck = [ - "pip_audit" - ]; + pythonImportsCheck = [ "pip_audit" ]; preCheck = '' export HOME=$(mktemp -d);