Merge pull request #104401 from fgaz/staticjinja/0.4.0

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

@@ -1,24 +1,45 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
+, isPy27
 , docopt
 , easywatch
 , jinja2
+, pytestCheckHook
+, markdown
 }:
 
 buildPythonPackage rec {
   pname = "staticjinja";
   version = "0.4.0";
 
-  src = fetchPypi {
+  disabled = isPy27; # 0.4.0 drops python2 support
-    inherit pname version;
+
-    sha256 = "597837899008409359680ee9cd04779639b9c0eb3380b6545025d26a702ba36c";
+  # For some reason, in pypi the tests get disabled when using
+  # PY_IGNORE_IMPORTMISMATCH, so we just fetch from GitHub
+  src = fetchFromGitHub {
+    owner = "staticjinja";
+    repo = pname;
+    rev = version;
+    sha256 = "0pysk8pzmcg1nfxz8m4i6bvww71w2zg6xp33zgg5vrf8yd2dfx9i";
   };
 
-  propagatedBuildInputs = [ jinja2 docopt easywatch ];
+  propagatedBuildInputs = [
+    jinja2
+    docopt
+    easywatch
+  ];
 
-  # There are no tests on pypi
+  checkInputs = [
-  doCheck = false;
+    pytestCheckHook
+    markdown
+  ];
+
+  # Import paths differ by a "build/lib" subdirectory, but the files are
+  # the same, so we ignore import mismatches.
+  preCheck = ''
+    export PY_IGNORE_IMPORTMISMATCH=1
+  '';
 
   meta = with lib; {
     description = "A library and cli tool that makes it easy to build static sites using Jinja2";
@@ -27,4 +48,3 @@ buildPythonPackage rec {
     maintainers = with maintainers; [ fgaz ];
   };
 }
-

pkgs/top-level/all-packages.nix

@@ -7727,6 +7727,8 @@ in
 
   stabber = callPackage ../misc/stabber { };
 
+  staticjinja = with python3.pkgs; toPythonApplication staticjinja;
+
   stress = callPackage ../tools/system/stress { };
 
   stress-ng = callPackage ../tools/system/stress-ng { };