From 3ba2300b2d24fd90e97468a605d50b5441c2770f Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 9 Aug 2017 13:18:05 +0800
Subject: pythonPackages.zodb: 4.0.1 -> 5.2.4

---
 pkgs/development/python-modules/zodb/default.nix | 48 ++++++++++++++++++++++++
 pkgs/top-level/python-packages.nix               | 28 +-------------
 2 files changed, 49 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/zodb/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
new file mode 100644
index 000000000000..a4855c23865c
--- /dev/null
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, isPy3k
+, zope_testrunner
+, transaction
+, six
+, wheel
+, zope_interface
+, zodbpickle
+, zconfig
+, persistent
+, zc_lockfile
+, BTrees
+, manuel
+}:
+
+buildPythonPackage rec {
+    pname = "ZODB";
+    version = "5.2.4";
+    name = "${pname}-${version}";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1pya0inkkxaqmi14gp796cidf894nz64n603zk670jj9xz0wkhgc";
+    };
+
+    propagatedBuildInputs = [
+      manuel
+      transaction
+      zope_testrunner
+      six
+      wheel
+      zope_interface
+      zodbpickle
+      zconfig
+      persistent
+      zc_lockfile
+      BTrees
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Zope Object Database: object database and persistence";
+      homepage = http://pypi.python.org/pypi/ZODB;
+      license = licenses.zpl21;
+      maintainers = with maintainers; [ goibhniu ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f56561053ce1..94345955e963 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24649,33 +24649,7 @@ EOF
     };
   };
 
-  zodb = buildPythonPackage rec {
-    name = "zodb-${version}";
-    disabled = isPyPy;
-
-    version = "4.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/Z/ZODB/ZODB-${version}.tar.gz";
-      sha256 = "c5d8ffcca37ab4d0a9bfffead6228d58c00cf1c78135abc98a8dbf05b8c8fb58";
-    };
-
-    propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface persistent BTrees ]
-      ++ optionals isPy3k [ zodbpickle ];
-
-    preCheck = if isPy3k then ''
-      # test failure on py3.4
-      rm src/ZODB/tests/testDB.py
-      rm src/ZODB/tests/test_fsdump.py # Error with Python 3.6
-    '' else "";
-
-    meta = {
-      description = "An object-oriented database for Python";
-      homepage = http://pypi.python.org/pypi/ZODB;
-      license = licenses.zpl20;
-      maintainers = with maintainers; [ goibhniu ];
-    };
-  };
+  zodb = callPackage ../development/python-modules/zodb {};
 
   zodbpickle = callPackage ../development/python-modules/zodbpickle {};
 
-- 
cgit 1.4.1