pythonPackage.psycopg2: fix

This commit is contained in:
Rok Garbas 2013-10-10 15:18:50 +02:00
parent a5357e80cd
commit 762164c8a7
3 changed files with 8 additions and 23 deletions

View file

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

View file

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

View file

@ -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
];
};