diff --git a/pkgs/development/python-modules/boolean-py/default.nix b/pkgs/development/python-modules/boolean-py/default.nix index dc1b1be0d81..3ac516e5e1b 100644 --- a/pkgs/development/python-modules/boolean-py/default.nix +++ b/pkgs/development/python-modules/boolean-py/default.nix @@ -1,21 +1,36 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - pname = "boolean.py"; - version = "3.8"; + pname = "boolean-py"; + version = "4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bastikr"; repo = "boolean.py"; rev = "v${version}"; - sha256 = "02jznrfrihhk69ai1vnh26s3rshl4kfc2id7li6xccavc2ws5y3b"; + hash = "sha256-i6aNzGDhZip9YHXLiuh9crGm2qT2toBU2xze4PDLleg="; }; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "boolean" + ]; + meta = with lib; { - homepage = "https://github.com/bastikr/boolean.py"; description = "Implements boolean algebra in one module"; + homepage = "https://github.com/bastikr/boolean.py"; license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index 5ed61931a7d..c6f2c678ba9 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "license-expression"; - version = "21.6.14"; + version = "30.0.0"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "nexB"; repo = "license-expression"; rev = "v${version}"; - sha256 = "sha256-hwfYKKalo8WYFwPCsRRXNz+/F8/42PXA8jxbIQjJH/g="; + hash = "sha256-tGXNZm9xH8sXa7dtBFsTzGgT+hfbmkwps7breR7KUWU="; }; dontConfigure = true; @@ -34,10 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "license_expression" ]; + pythonImportsCheck = [ + "license_expression" + ]; meta = with lib; { - description = "Utility library to parse, normalize and compare License expressions for Python"; + description = "Utility library to parse, normalize and compare License expressions"; homepage = "https://github.com/nexB/license-expression"; license = licenses.asl20; maintainers = with maintainers; [ fab ];