From 3d455ac9343fd4b9956e2bccd1d6b2a39d5a4eda Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 10:41:36 +0100
Subject: [PATCH] pythonPackages.xlwt: 1.0.0 -> 1.1.2

---
 .../python-modules/xlwt/default.nix           | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +----------
 2 files changed, 37 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/xlwt/default.nix

diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix
new file mode 100644
index 000000000000..ffcdd5ee6268
--- /dev/null
+++ b/pkgs/development/python-modules/xlwt/default.nix
@@ -0,0 +1,36 @@
+{ buildPythonPackage
+, fetchurl
+, fetchpatch
+, nose
+, lib
+}:
+
+buildPythonPackage rec {
+  pname = "xlwt";
+  name = "${pname}-${version}";
+  version = "1.1.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "aed648c17731f40f84550dd2a1aaa53569f0cbcaf5610ba895cd2632587b723c";
+  };
+
+  # re.LOCALE was removed in Python 3.6
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/python-excel/xlwt/commit/86564ef26341020316cd8a27c704ef1dc5a6129b.patch";
+      sha256 = "01abxfkmckcxpi6n5wi8ia58fmkzqrxjfjq1mjljygylm8nb3m8i";
+    })
+  ];
+
+  buildInputs = [ nose ];
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  meta = {
+    description = "Library to create spreadsheet files compatible with MS";
+    homepage = https://github.com/python-excel/xlwt;
+    license = with lib.licenses; [ bsdOriginal bsd3 lgpl21 ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5711faf65b6f..d83bd7b867ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26796,26 +26796,7 @@ EOF
     };
   };
 
-  xlwt = buildPythonPackage rec {
-    name = "xlwt-${version}";
-    version = "1.0.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/x/xlwt/${name}.tar.gz";
-      sha256 = "1y8w5imsicp01gn749qhw6j0grh9y19zz57ribwaknn8xqwjjhxc";
-    };
-
-    buildInputs = with self; [ nose ];
-    checkPhase = ''
-      nosetests -v
-    '';
-
-    meta = {
-      description = "Library to create spreadsheet files compatible with MS";
-      homepage = https://github.com/python-excel/xlwt;
-      license = with licenses; [ bsdOriginal bsd3 lgpl21 ];
-    };
-  };
+  xlwt = callPackage ../development/python-modules/xlwt { };
 
   youtube-dl = callPackage ../tools/misc/youtube-dl {};