From 0f5df81ddb3669a6beede8987c583749a49fceba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 May 2022 10:01:17 +0200 Subject: [PATCH 1/2] python310Packages.intbitset: fix license - disable on older Python releases --- pkgs/development/python-modules/intbitset/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index 9cedf7c4d28..f6459c13e70 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -2,6 +2,7 @@ , fetchPypi , buildPythonPackage , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -9,9 +10,11 @@ buildPythonPackage rec { version = "3.0.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-8ebQPGcpkioiPFGEnfZbnpFuYlrvuRF4Tn+azUwgfVM="; + hash = "sha256-8ebQPGcpkioiPFGEnfZbnpFuYlrvuRF4Tn+azUwgfVM="; }; checkInputs = [ @@ -25,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "C-based extension implementing fast integer bit sets"; homepage = "https://github.com/inveniosoftware/intbitset"; - license = licenses.lgpl3Only; + license = licenses.lgpl3Plus; maintainers = teams.determinatesystems.members; }; } From 58ec9c11ed1af8ced8eca964fbc195dd802d0618 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 May 2022 10:12:55 +0200 Subject: [PATCH 2/2] python310Packages.scancode-toolkit: relax intbitset constraint --- pkgs/development/python-modules/scancode-toolkit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index a5fdf3d547e..2c12019e9ac 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0="; + hash = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0="; }; dontConfigure = true; @@ -134,7 +134,8 @@ buildPythonPackage rec { --replace "pdfminer.six >= 20200101" "pdfminer.six" \ --replace "pluggy >= 0.12.0, < 1.0" "pluggy" \ --replace "pygmars >= 0.7.0" "pygmars" \ - --replace "license_expression >= 21.6.14" "license_expression" + --replace "license_expression >= 21.6.14" "license_expression" \ + --replace "intbitset >= 2.3.0, < 3.0" "intbitset" ''; # Importing scancode needs a writeable home, and preCheck happens in between