From 29b99ed9fa6c50ac7bef28ac41f8c82a1762ee8b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Oct 2013 10:44:18 +0200
Subject: [PATCH] Revert "pythonPackage.psycopg2: fix"

This reverts commit 762164c8a73864d6989f50fd87fb24aec9f9ff90 since it
breaks Nixpkgs evaluation: http://hydra.nixos.org/build/6471883
---
 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, 23 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index 4e72b12ffcc3..5ed553224d20 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 = [ pkgs.postgresql ];
+    buildInputs = [  ];
     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 065e9340e7d9..aefd911a5583 100644
--- a/pkgs/top-level/python-packages.json
+++ b/pkgs/top-level/python-packages.json
@@ -133,12 +133,7 @@
   },
   { "name": "psycopg2",
     "buildInputs": [ "pkgs.postgresql" ],
-    "doCheck": false,
-    "override": {
-      "psycopg2": {
-        "buildInputs": [ "pkgs.postgresql" ]
-      }
-    }
+    "doCheck": false
   }
 
 ]
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 94c8c1ba66e6..a33103cccb84 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4320,6 +4320,26 @@ 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";
@@ -5327,7 +5347,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 pythonPackages.psycopg2
+        pysvn pil psycopg2
       ];
   };