diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-11 10:44:18 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-11 10:44:18 +0200 |
| commit | 29b99ed9fa6c50ac7bef28ac41f8c82a1762ee8b (patch) | |
| tree | 3b6bc6dbe3f503e30496dfcb898a4555498ecd7b /pkgs/top-level/python-packages.nix | |
| parent | 7e065226451a06bedd6398b9f3f17f384659eae2 (diff) | |
| download | nixlib-29b99ed9fa6c50ac7bef28ac41f8c82a1762ee8b.tar nixlib-29b99ed9fa6c50ac7bef28ac41f8c82a1762ee8b.tar.gz nixlib-29b99ed9fa6c50ac7bef28ac41f8c82a1762ee8b.tar.bz2 nixlib-29b99ed9fa6c50ac7bef28ac41f8c82a1762ee8b.tar.lz nixlib-29b99ed9fa6c50ac7bef28ac41f8c82a1762ee8b.tar.xz nixlib-29b99ed9fa6c50ac7bef28ac41f8c82a1762ee8b.tar.zst nixlib-29b99ed9fa6c50ac7bef28ac41f8c82a1762ee8b.zip | |
Revert "pythonPackage.psycopg2: fix"
This reverts commit 762164c8a73864d6989f50fd87fb24aec9f9ff90 since it breaks Nixpkgs evaluation: http://hydra.nixos.org/build/6471883
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 22 |
1 files changed, 21 insertions, 1 deletions
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 ]; }; |