From 2c762cd68e4b6ada0a2a2488ba78ad8394a5c2b0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 2 Sep 2017 13:55:46 +0200
Subject: [PATCH] python.pkgs.flit: 0.10.0 -> 0.11.4

---
 .../python-modules/flit/default.nix           | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +--------
 2 files changed, 51 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/flit/default.nix

diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix
new file mode 100644
index 000000000000..2154feeebb7c
--- /dev/null
+++ b/pkgs/development/python-modules/flit/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fetchurl
+, isPy3k
+, docutils
+, requests
+, requests_download
+, zipfile36
+, pythonOlder
+, pytest
+, testpath
+, responses
+}:
+
+# Flit is actually an application to build universal wheels.
+# It requires Python 3 and should eventually be moved outside of
+# python-packages.nix. When it will be used to build wheels,
+# care should be taken that there is no mingling of PYTHONPATH.
+
+buildPythonPackage rec {
+  pname = "flit";
+  version = "0.11.4";
+  name = "${pname}-${version}";
+
+#   format = "wheel";
+
+  src = fetchPypi {
+    inherit pname version;
+#     url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl;
+    sha256 = "8ba7603cc3bf4149d81811d40fe331abc45ff37a207c63f5f712a0fdb69297bb";
+  };
+
+  disabled = !isPy3k;
+  propagatedBuildInputs = [ docutils requests requests_download ] ++ lib.optional (pythonOlder "3.6") zipfile36;
+
+  checkInputs = [ pytest testpath responses ];
+
+  # Disable test that needs some ini file.
+  checkPhase = ''
+    py.test -k "not test_invalid_classifier"
+  '';
+
+  meta = {
+    description = "A simple packaging tool for simple packages";
+    homepage = https://github.com/takluyver/flit;
+    license = lib.licenses.bsd3;
+    maintainer = lib.maintainers.fridh;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b592a4f2871f..b4ef9a8ce113 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5766,28 +5766,7 @@ in {
     propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ];
   });
 
-  flit = buildPythonPackage rec {
-    pname = "flit";
-    version = "0.10";
-    name = "${pname}-${version}";
-
-    format = "wheel";
-
-    src = pkgs.fetchurl {
-      url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl;
-      sha256 = "4566b2e1807abeb1fd7bfaa9b444447556f1720518edfb134b56a6a1272b0428";
-    };
-
-    disabled = !isPy3k;
-    propagatedBuildInputs = with self; [ docutils requests requests_download zipfile36];
-
-    meta = {
-      description = "A simple packaging tool for simple packages";
-      homepage = https://github.com/takluyver/flit;
-      license = licenses.bsd3;
-      maintainer = maintainers.fridh;
-    };
-  };
+  flit = callPackage ../development/python-modules/flit { };
 
   Flootty = buildPythonPackage rec {
     name = "Flootty-3.2.0";