summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrey Golovizin <ag@sologoc.com>2018-09-07 12:13:15 +0200
committerAndrey Golovizin <ag@sologoc.com>2018-09-07 15:40:34 +0200
commit2bec98ae06d21932872a4e9d80fa22bce09db91f (patch)
tree7ac96443d24ed30835518ed81585a200b88a0ffd
parentf9a067929762279146d667bcaa8310fd99716ab3 (diff)
downloadnixlib-2bec98ae06d21932872a4e9d80fa22bce09db91f.tar
nixlib-2bec98ae06d21932872a4e9d80fa22bce09db91f.tar.gz
nixlib-2bec98ae06d21932872a4e9d80fa22bce09db91f.tar.bz2
nixlib-2bec98ae06d21932872a4e9d80fa22bce09db91f.tar.lz
nixlib-2bec98ae06d21932872a4e9d80fa22bce09db91f.tar.xz
nixlib-2bec98ae06d21932872a4e9d80fa22bce09db91f.tar.zst
nixlib-2bec98ae06d21932872a4e9d80fa22bce09db91f.zip
pythonPackages.psycopg2: 2.7.1 -> 2.7.5
-rw-r--r--pkgs/development/python-modules/psycopg2/default.nix23
-rw-r--r--pkgs/top-level/python-packages.nix16
2 files changed, 24 insertions, 15 deletions
diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
new file mode 100644
index 000000000000..9d15ea694c73
--- /dev/null
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, buildPythonPackage, isPyPy, fetchPypi, postgresql, openssl }:
+
+buildPythonPackage rec {
+  pname = "psycopg2";
+  version = "2.7.5";
+
+  disabled = isPyPy;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17klx964gw8z0znl0raz3by8vdc7cq5gxj4pdcrfcina84nrdkzc";
+  };
+
+  buildInputs = lib.optional stdenv.isDarwin openssl;
+  propagatedBuildInputs = [ postgresql ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "PostgreSQL database adapter for the Python programming language";
+    license = with licenses; [ gpl2 zpl20 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dcb9961c01fe..e8bd6950f91a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9776,21 +9776,7 @@ in {
 
   psutil = callPackage ../development/python-modules/psutil { };
 
-  psycopg2 = buildPythonPackage rec {
-    name = "psycopg2-2.7.1";
-    disabled = isPyPy;
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/psycopg2/${name}.tar.gz";
-      sha256 = "86c9355f5374b008c8479bc00023b295c07d508f7c3b91dbd2e74f8925b1d9c6";
-    };
-    buildInputs = optional stdenv.isDarwin pkgs.openssl;
-    propagatedBuildInputs = with self; [ pkgs.postgresql ];
-    doCheck = false;
-    meta = {
-      description = "PostgreSQL database adapter for the Python programming language";
-      license = with licenses; [ gpl2 zpl20 ];
-    };
-  };
+  psycopg2 = callPackage ../development/python-modules/psycopg2 {};
 
   ptpython = callPackage ../development/python-modules/ptpython {};