From ada2fc05ef193c369dd02807c2b8866efcb7001b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 21:41:30 +0100 Subject: [PATCH 1/3] python313Packages.cryptodatahub: 0.12.5 -> 1.0.0 Changelog: https://gitlab.com/coroner/cryptodatahub/-/blob/1.0.0/CHANGELOG.rst --- .../python-modules/cryptodatahub/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix index ba5d3a0fcf1c..113c60d85940 100644 --- a/pkgs/development/python-modules/cryptodatahub/default.nix +++ b/pkgs/development/python-modules/cryptodatahub/default.nix @@ -5,43 +5,38 @@ beautifulsoup4, buildPythonPackage, fetchFromGitLab, - pathlib2, pyfakefs, python-dateutil, pythonOlder, setuptools, - six, + setuptools-scm, unittestCheckHook, urllib3, }: buildPythonPackage rec { pname = "cryptodatahub"; - version = "0.12.5"; + version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitLab { owner = "coroner"; repo = "cryptodatahub"; rev = "refs/tags/v${version}"; - hash = "sha256-jYMzvh4tgfLS7Za0MYHbWbczptAvENfzfTEV9Drlfto="; + hash = "sha256-taYpSYkfucc9GQpVDiAZgCt/D3Akld20LkFEhsdKH0Q="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace-fail "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" - ''; - - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ asn1crypto attrs - pathlib2 python-dateutil - six urllib3 ]; From a83e16b963221decf7b3f77aee88b7b086150d40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 21:42:42 +0100 Subject: [PATCH 2/3] python313Packages.cryptoparser: remove postPatch section --- .../python-modules/cryptoparser/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index 5e076f9dd8ae..11425b4022ed 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -8,6 +8,7 @@ python-dateutil, pythonOlder, setuptools, + setuptools-scm, urllib3, }: @@ -16,19 +17,17 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-bEvhMVcm9sXlfhxUD2K4N10nusgxpGYFJQLtJE1/qok="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace-fail "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" - ''; - - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ asn1crypto From 10abfb9691b790ab51e79a71993154b80e297695 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 21:47:30 +0100 Subject: [PATCH 3/3] python313Packages.cryptolyzer: refactor --- .../python-modules/cryptolyzer/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index c132fb88db6a..5290c347ce89 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -14,6 +14,7 @@ pythonOlder, requests, setuptools, + setuptools-scm, urllib3, }: @@ -22,22 +23,21 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-rRiRaXONLMNirKsK+QZWMSvaGeSLrHN9BpM8dhxoaxY="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace-warn "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" \ - --replace-warn "bs4" "beautifulsoup4" - ''; + pythonRemoveDeps = [ "bs4" ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ attrs beautifulsoup4 certvalidator