From 7cbf9e22a29103bc3c7ad47962f5c07fdae1973b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2019 17:50:13 -0700
Subject: [PATCH 1/2] python37Packages.pelican: 4.0.1 -> 4.1.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pelican/versions
---
 pkgs/development/python-modules/pelican/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index f593c5dbeea3..4feaa049d0fa 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "pelican";
-  version = "4.0.1";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "getpelican";
     repo = "pelican";
     rev = version;
-    sha256 = "09fcwnnfln0cl5v0qpxzrllj27znrg6dbhaksxrl0192c3mbyjvl";
+    sha256 = "0ag8il1b8ckfcv0f87ryrmw52k9m3xd025b4m6fvr8lsffyzv626";
   };
 
   doCheck = true;
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     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

From 4fca2ef585ec03e64f00383bc594191e0842dd1b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 19 Jul 2019 21:58:04 -0500
Subject: [PATCH 2/2] python37Packages.pelican: fix darwin build

---
 .../python-modules/pelican/default.nix            | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index 4feaa049d0fa..2dcc3e5b873b 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -12,13 +12,19 @@ buildPythonPackage rec {
     owner = "getpelican";
     repo = "pelican";
     rev = version;
-    sha256 = "0ag8il1b8ckfcv0f87ryrmw52k9m3xd025b4m6fvr8lsffyzv626";
+    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 = [
@@ -29,7 +35,6 @@ buildPythonPackage rec {
     # 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'"