From e3f31e6418ef02c5b03f6b36745c00d9f088aafc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 May 2024 10:58:46 +0200 Subject: [PATCH 1/3] python312Packages.cryptodatahub: 0.12.2 -> 0.12.4 Diff: https://gitlab.com/coroner/cryptodatahub/-/compare/refs/tags/v0.12.2...v0.12.4 Changelog: https://gitlab.com/coroner/cryptodatahub/-/blob/0.12.4/CHANGELOG.rst --- .../python-modules/cryptodatahub/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix index e19a4137e4f3..0a42e56d405a 100644 --- a/pkgs/development/python-modules/cryptodatahub/default.nix +++ b/pkgs/development/python-modules/cryptodatahub/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cryptodatahub"; - version = "0.12.2"; + version = "0.12.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,19 +25,19 @@ buildPythonPackage rec { owner = "coroner"; repo = "cryptodatahub"; rev = "refs/tags/v${version}"; - hash = "sha256-zVHHBQYcl26zTtXPAs/AgKOojKQORu08rpkfY0l1zjM="; + hash = "sha256-+IGzXYSaeZjN5AxBu7jXgrnGtrtaSveFiVeNQRBZMNg="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace-warn "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" + --replace-fail "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ asn1crypto attrs pathlib2 From 905b5cf0c9c544365b37443505fb6e9b15644138 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 May 2024 11:13:57 +0200 Subject: [PATCH 2/3] python312Packages.cryptoparser: 0.12.3 -> 0.12.4 Changelog: https://gitlab.com/coroner/cryptoparser/-/blob/v0.12.4/CHANGELOG.md --- .../python-modules/cryptoparser/default.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index fc18fadc3a3a..0d5564022e49 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -1,36 +1,39 @@ { lib -, buildPythonPackage -, fetchPypi -, setuptools -, attrs , asn1crypto +, attrs +, buildPythonPackage , cryptodatahub -, python-dateutil -, urllib3 +, fetchPypi , pytestCheckHook +, python-dateutil +, pythonOlder +, setuptools +, unittestCheckHook +, urllib3 }: buildPythonPackage rec { pname = "cryptoparser"; - version = "0.12.3"; + version = "0.12.4"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { - pname = "CryptoParser"; - inherit version; - hash = "sha256-1A0VEpUPsYtEu2aT+ldt/Z/PtV8lvD+9jSx75yGB6Ao="; + inherit pname version; + hash = "sha256-y5rpc0tn5JJQr4xdRUJbsq8XT/YqqJqZr3CXjqN7k7I="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace-warn "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" + --replace-fail "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ asn1crypto attrs cryptodatahub From b3404644aaef4003eb00b3ace609e424fdb5ebe6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 May 2024 11:15:12 +0200 Subject: [PATCH 3/3] python312Packages.cryptoparser: format with nixfmt --- .../python-modules/cryptoparser/default.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index 0d5564022e49..61efe59f0637 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -1,15 +1,16 @@ -{ lib -, asn1crypto -, attrs -, buildPythonPackage -, cryptodatahub -, fetchPypi -, pytestCheckHook -, python-dateutil -, pythonOlder -, setuptools -, unittestCheckHook -, urllib3 +{ + lib, + asn1crypto, + attrs, + buildPythonPackage, + cryptodatahub, + fetchPypi, + pytestCheckHook, + python-dateutil, + pythonOlder, + setuptools, + unittestCheckHook, + urllib3, }: buildPythonPackage rec { @@ -29,9 +30,7 @@ buildPythonPackage rec { --replace-fail "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ asn1crypto @@ -41,9 +40,7 @@ buildPythonPackage rec { urllib3 ]; - pythonImportsCheck = [ - "cryptoparser" - ]; + pythonImportsCheck = [ "cryptoparser" ]; meta = with lib; { description = "Security protocol parser and generator";