From 45323efb5544114ea390c5fc9174c41dfb803d5c Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 15 Oct 2018 12:28:32 -0400
Subject: [PATCH] pythonPackages.bsddb3: 6.1.1 -> 6.2.6

refactor move to python-modules.
---
 .../python-modules/bsddb3/default.nix         | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 30 +--------------
 2 files changed, 39 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/development/python-modules/bsddb3/default.nix

diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix
new file mode 100644
index 000000000000..971aac70ad8e
--- /dev/null
+++ b/pkgs/development/python-modules/bsddb3/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "bsddb3";
+  version = "6.2.6";
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "42d621f4037425afcb16b67d5600c4556271a071a9a7f7f2c2b1ba65bc582d05";
+  };
+
+  buildInputs = [ pkgs.db ];
+
+  # Judging from SyntaxError in test
+  doCheck = false; # test suite breaks python3 compatibility
+
+  # Path to database need to be set.
+  # Somehow the setup.py flag is not propagated.
+  #setupPyBuildFlags = [ "--berkeley-db=${pkgs.db}" ];
+  # We can also use a variable
+  preConfigure = ''
+    export BERKELEYDB_DIR=${pkgs.db.dev};
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python bindings for Oracle Berkeley DB";
+    homepage = https://www.jcea.es/programacion/pybsddb.htm;
+    license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x
+    maintainers = [ maintainers.costrouc ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ef02f63bcb9..a65583a413b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1182,35 +1182,7 @@ in {
 
   bpython = callPackage ../development/python-modules/bpython {};
 
-  bsddb3 = buildPythonPackage rec {
-    name = "bsddb3-${version}";
-    version = "6.1.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/b/bsddb3/${name}.tar.gz";
-      sha256 = "6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3";
-    };
-
-    buildInputs = [ pkgs.db ];
-
-    # Judging from SyntaxError in test
-#    disabled = isPy3k;
-    doCheck = false; # test suite breaks python3 compatibility
-
-    # Path to database need to be set.
-    # Somehow the setup.py flag is not propagated.
-    #setupPyBuildFlags = [ "--berkeley-db=${pkgs.db}" ];
-    # We can also use a variable
-    preConfigure = ''
-      export BERKELEYDB_DIR=${pkgs.db.dev};
-    '';
-
-    meta = {
-      description = "Python bindings for Oracle Berkeley DB";
-      homepage = https://www.jcea.es/programacion/pybsddb.htm;
-      license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x
-    };
-  };
+  bsddb3 = callPackage ../development/python-modules/bsddb3 { };
 
   bkcharts = callPackage ../development/python-modules/bkcharts { };