Merge pull request #46316 from erosennin/psycopg-2.7.5

pythonPackages.psycopg2: 2.7.1 -> 2.7.5
This commit is contained in:
Jörg Thalheim 2018-09-18 11:33:06 +01:00 committed by GitHub
commit 7d39e99a1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 15 deletions

View File

@ -0,0 +1,23 @@
{ stdenv, lib, buildPythonPackage, isPyPy, fetchPypi, postgresql, openssl }:
buildPythonPackage rec {
pname = "psycopg2";
version = "2.7.5";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
sha256 = "17klx964gw8z0znl0raz3by8vdc7cq5gxj4pdcrfcina84nrdkzc";
};
buildInputs = lib.optional stdenv.isDarwin openssl;
propagatedBuildInputs = [ postgresql ];
doCheck = false;
meta = with lib; {
description = "PostgreSQL database adapter for the Python programming language";
license = with licenses; [ gpl2 zpl20 ];
};
}

View File

@ -9752,21 +9752,7 @@ in {
psutil = callPackage ../development/python-modules/psutil { };
psycopg2 = buildPythonPackage rec {
name = "psycopg2-2.7.1";
disabled = isPyPy;
src = pkgs.fetchurl {
url = "mirror://pypi/p/psycopg2/${name}.tar.gz";
sha256 = "86c9355f5374b008c8479bc00023b295c07d508f7c3b91dbd2e74f8925b1d9c6";
};
buildInputs = optional stdenv.isDarwin pkgs.openssl;
propagatedBuildInputs = with self; [ pkgs.postgresql ];
doCheck = false;
meta = {
description = "PostgreSQL database adapter for the Python programming language";
license = with licenses; [ gpl2 zpl20 ];
};
};
psycopg2 = callPackage ../development/python-modules/psycopg2 {};
ptpython = callPackage ../development/python-modules/ptpython {};