From 762164c8a73864d6989f50fd87fb24aec9f9ff90 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 10 Oct 2013 15:18:50 +0200
Subject: pythonPackage.psycopg2: fix

---
 pkgs/top-level/python-packages-generated.nix |  2 +-
 pkgs/top-level/python-packages.json          |  7 ++++++-
 pkgs/top-level/python-packages.nix           | 22 +---------------------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index 5ed553224d20..4e72b12ffcc3 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -2552,7 +2552,7 @@ in
         md5 = "1b433f83d50d1bc61e09026e906d84c7";
     };
     doCheck = false;
-    buildInputs = [  ];
+    buildInputs = [ pkgs.postgresql ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
index aefd911a5583..065e9340e7d9 100644
--- a/pkgs/top-level/python-packages.json
+++ b/pkgs/top-level/python-packages.json
@@ -133,7 +133,12 @@
   },
   { "name": "psycopg2",
     "buildInputs": [ "pkgs.postgresql" ],
-    "doCheck": false
+    "doCheck": false,
+    "override": {
+      "psycopg2": {
+        "buildInputs": [ "pkgs.postgresql" ]
+      }
+    }
   }
 
 ]
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a33103cccb84..94c8c1ba66e6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4320,26 +4320,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
 
-  psycopg2 = buildPythonPackage rec {
-    name = "psycopg2-2.5.1";
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.1.tar.gz";
-      sha256 = "1v7glzzzykbaqj7dhpr0qds9cf4maxmn7f5aazpqnbg0ly40r9v5";
-    };
-
-    propagatedBuildInputs = [ pkgs.postgresql ];
-
-    meta = {
-      description = "PostgreSQL database adapter for the Python programming language";
-      license = "GPLv2/ZPL";
-    };
-  };
-
-
   publicsuffix = buildPythonPackage rec {
     name = "publicsuffix-${version}";
     version = "1.0.2";
@@ -5347,7 +5327,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     propagatedBuildInputs =
       [ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments
         djblets django_1_3 django_evolution pycrypto modules.sqlite3
-        pysvn pil psycopg2
+        pysvn pil pythonPackages.psycopg2
       ];
   };
 
-- 
cgit 1.4.1