about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2019-07-19 22:37:39 -0500
committerGitHub <noreply@github.com>2019-07-19 22:37:39 -0500
commit0ee5701cd718f68cb6414e96e4c3609e2cf122cf (patch)
tree10591d5d2f42db52d9a58ca1639d13cef36831a1 /pkgs
parent8965de1199f6dbb428be8b31229d1602c6c461ca (diff)
parent4fca2ef585ec03e64f00383bc594191e0842dd1b (diff)
downloadnixlib-0ee5701cd718f68cb6414e96e4c3609e2cf122cf.tar
nixlib-0ee5701cd718f68cb6414e96e4c3609e2cf122cf.tar.gz
nixlib-0ee5701cd718f68cb6414e96e4c3609e2cf122cf.tar.bz2
nixlib-0ee5701cd718f68cb6414e96e4c3609e2cf122cf.tar.lz
nixlib-0ee5701cd718f68cb6414e96e4c3609e2cf122cf.tar.xz
nixlib-0ee5701cd718f68cb6414e96e4c3609e2cf122cf.tar.zst
nixlib-0ee5701cd718f68cb6414e96e4c3609e2cf122cf.zip
Merge pull request #65116 from r-ryantm/auto-update/python3.7-pelican
python37Packages.pelican: 4.0.1 -> 4.1.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/pelican/default.nix19
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index f593c5dbeea3..2dcc3e5b873b 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -6,30 +6,35 @@
 
 buildPythonPackage rec {
   pname = "pelican";
-  version = "4.0.1";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "getpelican";
     repo = "pelican";
     rev = version;
-    sha256 = "09fcwnnfln0cl5v0qpxzrllj27znrg6dbhaksxrl0192c3mbyjvl";
+    sha256 = "1ww3kc5bzp5q7b23n2vmzqch1z06l7vrscn0h96cscvk45sxc7yz";
+    # Remove unicode file names which leads to different checksums on HFS+
+    # vs. other filesystems because of unicode normalisation.
+    extraPostFetch = ''
+      rm -r $out/pelican/tests/output/custom_locale/posts
+    '';
   };
 
   doCheck = true;
 
+  # Exclude custom locale test, which files were removed above to fix the source checksum
   checkPhase = ''
-    python -Wd -m unittest discover
+    nosetests -sv --exclude=test_custom_locale_generation_works pelican
   '';
 
   buildInputs = [
     glibcLocales
     # Note: Pelican has to adapt to a changed CLI of pandoc before enabling this
     # again. Compare https://github.com/getpelican/pelican/pull/2252.
-    # Version 4.0.1 is incompatible with our current pandoc version.
+    # Version 4.1.0 is incompatible with our current pandoc version.
     # pandoc
     git
     mock
-    nose
     markdown
     typogrify
   ];
@@ -39,6 +44,10 @@ buildPythonPackage rec {
     blinker pillow beautifulsoup4 markupsafe lxml
   ];
 
+  checkInputs = [
+    nose
+  ];
+
   postPatch= ''
     substituteInPlace pelican/tests/test_pelican.py \
       --replace "'git'" "'${git}/bin/git'"