public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "pythonPackage.psycopg2: fix"

Browse Source 
This reverts commit 762164c8a73864d6989f50fd87fb24aec9f9ff90 since it
breaks Nixpkgs evaluation: http://hydra.nixos.org/build/6471883
This commit is contained in:
Eelco Dolstra 2013-10-11 10:44:18 +02:00
parent 7e06522645
commit 29b99ed9fa
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/python-packages-generated.nix
View File

@ -2552,7 +2552,7 @@ in
md5 = "1b433f83d50d1bc61e09026e906d84c7"; md5 = "1b433f83d50d1bc61e09026e906d84c7";
}; };
doCheck = false; doCheck = false;
buildInputs = [ pkgs.postgresql ]; buildInputs = [ ];
propagatedBuildInputs = [ ]; propagatedBuildInputs = [ ];
installCommand = ''easy_install --always-unzip --prefix="$out" .''; installCommand = ''easy_install --always-unzip --prefix="$out" .'';
meta = { meta = {

7
pkgs/top-level/python-packages.json
View File

@ -133,12 +133,7 @@
}, },
{ "name": "psycopg2", { "name": "psycopg2",
"buildInputs": [ "pkgs.postgresql" ], "buildInputs": [ "pkgs.postgresql" ],
"doCheck": false, "doCheck": false
"override": {
"psycopg2": {
"buildInputs": [ "pkgs.postgresql" ]
}
}
} }
] ]

22
pkgs/top-level/python-packages.nix
View File

@ -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 { publicsuffix = buildPythonPackage rec {
name = "publicsuffix-${version}"; name = "publicsuffix-${version}";
version = "1.0.2"; version = "1.0.2";
@ -5327,7 +5347,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
propagatedBuildInputs = propagatedBuildInputs =
[ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments [ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments
djblets django_1_3 django_evolution pycrypto modules.sqlite3 djblets django_1_3 django_evolution pycrypto modules.sqlite3
pysvn pil pythonPackages.psycopg2 pysvn pil psycopg2
]; ];
}; };