From 4610d2694e5334eb1a75bf3363c0e0e8b91c76cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Apr 2024 12:29:31 +0200 Subject: [PATCH 1/6] python312Packages.apsw: 3.45.1.0 -> 3.45.2.0 Diff: rogerbinns/apsw@refs/tags/3.45.1.0...3.45.2.0 Changelog: https://github.com/rogerbinns/apsw/releases/tag/3.45.2.0 --- .../python-modules/apsw/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index bdd640a4ce50..327a67d0e3fb 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,17 +1,19 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, sqlite -, isPyPy -, python +{ + lib, + buildPythonPackage, + fetchFromGitHub, + python, + pythonOlder, + setuptools, + sqlite, }: buildPythonPackage rec { pname = "apsw"; version = "3.45.2.0"; - format = "setuptools"; + pyproject = true; - disabled = isPyPy; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "rogerbinns"; @@ -20,9 +22,9 @@ buildPythonPackage rec { hash = "sha256-tTi3/10W4OoGH6PQVhvPWc5o09on5BZrWoAvrfh4C/E="; }; - buildInputs = [ - sqlite - ]; + build-system = [ setuptools ]; + + buildInputs = [ sqlite ]; # Project uses custom test setup to exclude some tests by default, so using pytest # requires more maintenance @@ -31,13 +33,12 @@ buildPythonPackage rec { ${python.interpreter} setup.py test ''; - pythonImportsCheck = [ - "apsw" - ]; + pythonImportsCheck = [ "apsw" ]; meta = with lib; { description = "A Python wrapper for the SQLite embedded relational database engine"; homepage = "https://github.com/rogerbinns/apsw"; + changelog = "https://github.com/rogerbinns/apsw/releases/tag/${version}"; license = licenses.zlib; maintainers = with maintainers; [ gador ]; }; From 2f85c76e07fcfeec9e2753ea87d63ee74d6e2e4c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Apr 2024 12:39:07 +0200 Subject: [PATCH 2/6] python312Packages.appthreat-vulnerability-db: format with nixfmt --- .../appthreat-vulnerability-db/default.nix | 47 ++++++++----------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 22ef8222b04b..bd009f3236d4 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -1,18 +1,19 @@ -{ lib -, appdirs -, buildPythonPackage -, cvss -, fetchFromGitHub -, httpx -, msgpack -, orjson -, packageurl-python -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, semver -, setuptools -, tabulate +{ + lib, + appdirs, + buildPythonPackage, + cvss, + fetchFromGitHub, + httpx, + msgpack, + orjson, + packageurl-python, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + semver, + setuptools, + tabulate, }: buildPythonPackage rec { @@ -39,13 +40,9 @@ buildPythonPackage rec { "semver" ]; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ appdirs @@ -58,9 +55,7 @@ buildPythonPackage rec { tabulate ] ++ httpx.optional-dependencies.http2; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export HOME=$(mktemp -d); @@ -72,9 +67,7 @@ buildPythonPackage rec { "test_download_recent" ]; - pythonImportsCheck = [ - "vdb" - ]; + pythonImportsCheck = [ "vdb" ]; meta = with lib; { description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm"; From dbf5e973575c35c6c13fe0959c80be9d10bc1567 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Apr 2024 12:39:53 +0200 Subject: [PATCH 3/6] python312Packages.appthreat-vulnerability-db: 5.6.6 -> 5.6.7 Diff: https://github.com/AppThreat/vulnerability-db/compare/refs/tags/v5.6.6...5.6.7 Changelog: https://github.com/AppThreat/vulnerability-db/releases/tag/v5.6.7 --- .../python-modules/appthreat-vulnerability-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index bd009f3236d4..67ed8ef74b59 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.6.6"; + version = "5.6.7"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-wVl2C1AG9LbSh/p95fstJyJr6JnhZFIhNvq8mhpg13Q="; + hash = "sha256-/QzK+su+g2ESZ81C0coxKf13WOUVz1GyfJbOrO7fS98="; }; postPatch = '' From f70161f889b2c3e31a7768d352c7428c5907f916 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Apr 2024 12:40:30 +0200 Subject: [PATCH 4/6] dep-scan: 5.2.14 -> 5.3.2 Diff: https://github.com/owasp-dep-scan/dep-scan/compare/refs/tags/v5.2.14...v5.3.2 Changelog: https://github.com/owasp-dep-scan/dep-scan/releases/tag/v5.3.2 --- pkgs/by-name/de/dep-scan/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index 74aa2530fbd0..ea75418b0476 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -5,22 +5,19 @@ python3.pkgs.buildPythonApplication rec { pname = "dep-scan"; - version = "5.2.14"; + version = "5.3.2"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-G8i/tGEDgjPnIP04nrbx4HseiaU6N1GJGSg78yhaqII="; + hash = "sha256-2WV4f9vHdfnzoQWvwK/+lT9IS0v0sGBqnwDFHWG48G4="; }; postPatch = '' substituteInPlace pytest.ini \ --replace-fail " --cov-append --cov-report term --cov depscan" "" - # Already fixed by upstream - substituteInPlace pyproject.toml \ - --replace-fail "==5.6.4" ">=5.6.4" ''; build-system = with python3.pkgs; [ From ded5cfda5932e2b198cb86c6e677e475cec13548 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Apr 2024 12:42:22 +0200 Subject: [PATCH 5/6] dep-scan: format with nixfmt --- pkgs/by-name/de/dep-scan/package.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index ea75418b0476..fe4ccf72df62 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -1,6 +1,7 @@ -{ lib -, python3 -, fetchFromGitHub +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -20,9 +21,7 @@ python3.pkgs.buildPythonApplication rec { --replace-fail " --cov-append --cov-report term --cov depscan" "" ''; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ appthreat-vulnerability-db @@ -44,9 +43,7 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; - pythonImportsCheck = [ - "depscan" - ]; + pythonImportsCheck = [ "depscan" ]; preCheck = '' export HOME=$(mktemp -d) From ee3702bff257b954b3375b93dbf2f2ad6bf89193 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Apr 2024 12:46:50 +0200 Subject: [PATCH 6/6] appthreat-depscan: rename to dep-scan --- .../tools/appthreat-depscan/default.nix | 53 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 pkgs/development/tools/appthreat-depscan/default.nix diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix deleted file mode 100644 index f9bed90f8ba4..000000000000 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "appthreat-depscan"; - version = "3.6.0"; - - src = fetchFromGitHub { - owner = "AppThreat"; - repo = "dep-scan"; - rev = "refs/tags/v${version}"; - hash = "sha256-U8vHwdL1O54X0jPhcjTN/J1U7dKQgFEMfc6lbXe2Ff0="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - appthreat-vulnerability-db - defusedxml - pyyaml - rich - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; - - postPatch = '' - substituteInPlace pytest.ini \ - --replace " --cov-append --cov-report term --cov depscan" "" - ''; - - preCheck = '' - export HOME=$(mktemp -d); - ''; - - disabledTests = [ - # Assertion Error - "test_query_metadata2" - ]; - - pythonImportsCheck = [ - "depscan" - ]; - - meta = with lib; { - description = "Tool to audit dependencies based on known vulnerabilities and advisories"; - homepage = "https://github.com/AppThreat/dep-scan"; - changelog = "https://github.com/AppThreat/dep-scan/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8e9d506706d8..c8c8b0dd4b6f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -76,6 +76,7 @@ mapAliases ({ ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 antimicroX = antimicrox; # Added 2021-10-31 + appthreat-depscan = dep-scan; # Added 2024-04-10 arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03 ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db8d02340712..5f8dd6add882 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -299,8 +299,6 @@ with pkgs; melange = callPackage ../development/tools/melange { }; - appthreat-depscan = callPackage ../development/tools/appthreat-depscan { }; - activate-linux = callPackage ../applications/misc/activate-linux { }; ansi = callPackage ../development/tools/ansi { };