Merge pull request #66372 from kirelagin/fsfe-reuse-0.4.1

reuse: 0.3.4 -> 0.4.1

pkgs/development/python-modules/boolean-py/default.nix

@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  pname = "boolean.py";
+  version = "3.6";
+
+  src = fetchFromGitHub {
+    owner = "bastikr";
+    repo = "boolean.py";
+    rev = "v${version}";
+    sha256 = "1wc89y73va58cj7dsx6c199zpxsy9q53dsffsdj6zmc90inqz6qs";
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/bastikr/boolean.py";
+    description = "Implements boolean algebra in one module";
+    license = licenses.bsd2;
+  };
+
+}

pkgs/development/python-modules/license-expression/default.nix

@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, boolean-py
+}:
+
+buildPythonPackage rec {
+  pname = "license-expression";
+  version = "0.999";
+
+  src = fetchFromGitHub {
+    owner = "nexB";
+    repo = "license-expression";
+    rev = "v${version}";
+    sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0";
+  };
+
+  propagatedBuildInputs = [ boolean-py ];
+
+  meta = with lib; {
+    homepage = "https://github.com/nexB/license-expression";
+    description = "Utility library to parse, normalize and compare License expressions for Python using a boolean logic engine";
+    license = licenses.asl20;
+  };
+
+}

pkgs/tools/package-management/reuse/default.nix

@@ -1,30 +1,25 @@
-{ lib, python3Packages, fetchFromGitLab }:
+{ lib, python3Packages, fetchFromGitHub }:
 
 with python3Packages;
 
 buildPythonApplication rec {
   pname = "reuse";
-  version = "0.3.4";
+  version = "0.4.1";
 
-  src = fetchFromGitLab {
+  src = fetchFromGitHub {
-    owner = "reuse";
+    owner = "fsfe";
-    repo = "reuse";
+    repo = "reuse-tool";
     rev = "v${version}";
-    sha256 = "07acv02wignrsfhym2i3dhlcs501yj426lnff2cjampl6m5cgsk3";
+    sha256 = "0gwipwikhxsk0p8wvdl90xm7chfi2jywb1namzznyymifl1vsbgh";
   };
 
-  propagatedBuildInputs = [ chardet debian pygit2 ];
+  propagatedBuildInputs = [ debian license-expression requests ];
 
-  checkInputs = [ pytest jinja2 ];
+  checkInputs = [ pytest ];
-
-  # Some path based tests are currently broken under nix
-  checkPhase = ''
-    pytest tests -k "not test_lint_none and not test_lint_ignore_debian and not test_lint_twice_path"
-  '';
 
   meta = with lib; {
     description = "A tool for compliance with the REUSE Initiative recommendations";
-    license = with licenses; [ cc-by-sa-40 cc0 gpl3 ];
+    license = with licenses; [ asl20 cc-by-sa-40 cc0 gpl3 ];
     maintainers = [ maintainers.FlorianFranzen ];
   };
 }

pkgs/top-level/python-packages.nix

@@ -1495,6 +1495,8 @@ in {
 
   boltztrap2 = callPackage ../development/python-modules/boltztrap2 { };
 
+  boolean-py = callPackage ../development/python-modules/boolean-py { };
+
   bumps = callPackage ../development/python-modules/bumps {};
 
   cached-property = callPackage ../development/python-modules/cached-property { };
@@ -2450,6 +2452,8 @@ in {
 
   libthumbor = callPackage ../development/python-modules/libthumbor { };
 
+  license-expression = callPackage ../development/python-modules/license-expression { };
+
   lightblue = callPackage ../development/python-modules/lightblue { };
 
   lightgbm = callPackage ../development/python-modules/lightgbm { };