Merge pull request #139468 from fabaff/master

python3Packages.xml2rfc: 3.9.1 -> 3.10.0

pkgs/development/python-modules/xml2rfc/default.nix

@@ -1,15 +1,34 @@
-{ lib, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address
+{ lib
-, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, configargparse, appdirs
+, fetchPypi
+, buildPythonPackage
+, pythonOlder
+, intervaltree
+, pyflakes
+, requests
+, lxml
+, google-i18n-address
+, pycountry
+, html5lib
+, six
+, kitchen
+, pypdf2
+, dict2xml
+, weasyprint
+, pyyaml
+, jinja2
+, configargparse
+, appdirs
 }:
 
 buildPythonPackage rec {
   pname = "xml2rfc";
-  version = "3.9.1";
+  version = "3.10.0";
-  disabled = pythonAtLeast "3.9";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "76cee167e81fc3cc0e0cc696fe58cadd039e19a774c8f4d2e5c0fea724c7aaca";
+    sha256 = "sha256-DJjGQAYFhXjAiJhWzxpQ0jRUSrnsNCcNz1KfPEjBoKE=";
   };
 
   propagatedBuildInputs = [
@@ -31,12 +50,18 @@ buildPythonPackage rec {
     appdirs
   ];
 
+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace "jinja2>=2.11,<3.0" "jinja2>=2.11"
+  '';
+
   preCheck = ''
     export HOME=$(mktemp -d)
   '';
 
   # lxml tries to fetch from the internet
   doCheck = false;
+
   pythonImportsCheck = [ "xml2rfc" ];
 
   meta = with lib; {