Merge pull request #172460 from fabaff/bump-license-expression

This commit is contained in:
Sandro 2022-05-12 15:35:15 +02:00 committed by GitHub
commit 8de6cb9ada
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 10 deletions

View file

@ -1,21 +1,36 @@
{ lib, buildPythonPackage, fetchFromGitHub { lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "boolean.py"; pname = "boolean-py";
version = "3.8"; version = "4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bastikr"; owner = "bastikr";
repo = "boolean.py"; repo = "boolean.py";
rev = "v${version}"; rev = "v${version}";
sha256 = "02jznrfrihhk69ai1vnh26s3rshl4kfc2id7li6xccavc2ws5y3b"; hash = "sha256-i6aNzGDhZip9YHXLiuh9crGm2qT2toBU2xze4PDLleg=";
}; };
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"boolean"
];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/bastikr/boolean.py";
description = "Implements boolean algebra in one module"; description = "Implements boolean algebra in one module";
homepage = "https://github.com/bastikr/boolean.py";
license = licenses.bsd2; license = licenses.bsd2;
maintainers = with maintainers; [ ];
}; };
} }

View file

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "license-expression"; pname = "license-expression";
version = "21.6.14"; version = "30.0.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "nexB"; owner = "nexB";
repo = "license-expression"; repo = "license-expression";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-hwfYKKalo8WYFwPCsRRXNz+/F8/42PXA8jxbIQjJH/g="; hash = "sha256-tGXNZm9xH8sXa7dtBFsTzGgT+hfbmkwps7breR7KUWU=";
}; };
dontConfigure = true; dontConfigure = true;
@ -34,10 +34,12 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [ "license_expression" ]; pythonImportsCheck = [
"license_expression"
];
meta = with lib; { 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"; homepage = "https://github.com/nexB/license-expression";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];