diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-18 11:33:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-18 11:33:06 +0100 |
commit | 7d39e99a1ec67ac182796f517fc61c3824771c32 (patch) | |
tree | 3df6f51ed993f85c2456e8695cc744417832c795 /pkgs | |
parent | 947ae71dcec680b5075ece14e38eae64831b9819 (diff) | |
parent | 2bec98ae06d21932872a4e9d80fa22bce09db91f (diff) | |
download | nixlib-7d39e99a1ec67ac182796f517fc61c3824771c32.tar nixlib-7d39e99a1ec67ac182796f517fc61c3824771c32.tar.gz nixlib-7d39e99a1ec67ac182796f517fc61c3824771c32.tar.bz2 nixlib-7d39e99a1ec67ac182796f517fc61c3824771c32.tar.lz nixlib-7d39e99a1ec67ac182796f517fc61c3824771c32.tar.xz nixlib-7d39e99a1ec67ac182796f517fc61c3824771c32.tar.zst nixlib-7d39e99a1ec67ac182796f517fc61c3824771c32.zip |
Merge pull request #46316 from erosennin/psycopg-2.7.5
pythonPackages.psycopg2: 2.7.1 -> 2.7.5
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/psycopg2/default.nix | 23 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 16 |
2 files changed, 24 insertions, 15 deletions
diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix new file mode 100644 index 000000000000..9d15ea694c73 --- /dev/null +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5936345bf0a3..7990034af7e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 {}; |