From 7d19959ac5c17361e6fc56df303e4b4ee9e75816 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 14 Jul 2017 11:06:29 +0800
Subject: [PATCH] pythonPackages.zconfig: 3.0.3 -> 3.2.0

---
 .../python-modules/zconfig/default.nix        | 27 +++++++++++++++++++
 .../zconfig/skip-broken-test.patch            | 12 +++++++++
 pkgs/top-level/python-packages.nix            | 18 +------------
 3 files changed, 40 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/zconfig/default.nix
 create mode 100644 pkgs/development/python-modules/zconfig/skip-broken-test.patch

diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
new file mode 100644
index 000000000000..aa90bf0ce1a6
--- /dev/null
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, zope_testrunner
+}:
+
+buildPythonPackage rec {
+  pname = "ZConfig";
+  version = "3.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19";
+  };
+
+  patches = [ ./skip-broken-test.patch ];
+
+  propagatedBuildInputs = [ zope_testrunner ];
+
+  meta = with stdenv.lib; {
+    description = "Structured Configuration Library";
+    homepage = http://pypi.python.org/pypi/ZConfig;
+    license = licenses.zpt20;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/development/python-modules/zconfig/skip-broken-test.patch b/pkgs/development/python-modules/zconfig/skip-broken-test.patch
new file mode 100644
index 000000000000..ee3fcff49036
--- /dev/null
+++ b/pkgs/development/python-modules/zconfig/skip-broken-test.patch
@@ -0,0 +1,12 @@
+diff --git a/ZConfig/tests/test_schema2html.py b/ZConfig/tests/test_schema2html.py
+index 838cf7c..52daf4e 100644
+--- a/ZConfig/tests/test_schema2html.py
++++ b/ZConfig/tests/test_schema2html.py
+@@ -74,6 +74,7 @@ else:
+ 
+ class TestSchema2HTML(unittest.TestCase):
+ 
++    @unittest.skip('broken test (https://github.com/zopefoundation/ZConfig/issues/34)')
+     def test_no_schema(self):
+         self.assertRaises(SystemExit,
+                           run_transform)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 113a0255170f..99cd6acb4d78 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25660,24 +25660,8 @@ EOF
     };
   });
 
-  zconfig = buildPythonPackage rec {
-    name = "zconfig-${version}";
-    version = "3.0.3";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/Z/ZConfig/ZConfig-${version}.tar.gz";
-      sha256 = "6577da957511d8c2f805fefd2e31cacc4117bb5c54aec03ad8ce374020c021f3";
-    };
-
-    propagatedBuildInputs = with self; [ zope_testrunner ];
-
-    meta = {
-      description = "Structured Configuration Library";
-      homepage = http://pypi.python.org/pypi/ZConfig;
-      license = licenses.zpt20;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
+  zconfig = callPackage ../development/python-modules/zconfig { };
 
 
   zc_lockfile = buildPythonPackage rec {