diff options
author | Peter Simons <simons@cryp.to> | 2019-10-05 21:48:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-05 21:48:36 +0200 |
commit | 35521b42c24703046e3f236e25b0fdb6929b0371 (patch) | |
tree | 8a2c2d309437c14e83230e5173ce050b592432d1 /pkgs/development/tools | |
parent | 2a116c3bb903d2300f08d335299ad87a82aa21cc (diff) | |
download | nixlib-35521b42c24703046e3f236e25b0fdb6929b0371.tar nixlib-35521b42c24703046e3f236e25b0fdb6929b0371.tar.gz nixlib-35521b42c24703046e3f236e25b0fdb6929b0371.tar.bz2 nixlib-35521b42c24703046e3f236e25b0fdb6929b0371.tar.lz nixlib-35521b42c24703046e3f236e25b0fdb6929b0371.tar.xz nixlib-35521b42c24703046e3f236e25b0fdb6929b0371.tar.zst nixlib-35521b42c24703046e3f236e25b0fdb6929b0371.zip |
update Python packages psycopg2, sqlparse, and pgcli (#70257)
* python-psycopg2: update from 2.7.7 to 2.8.3 * python-sqlparse: update from 0.2.4 to 0.3.0 * pgcli: update from 2.0.2 to 2.1.1
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/database/pgcli/default.nix | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 31ffff3804f0..147988b22b3c 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,38 +1,29 @@ -{ lib, python3Packages, fetchpatch }: +{ buildPythonApplication, lib, fetchPypi, isPy3k, fetchpatch +, cli-helpers, click, configobj, humanize, prompt_toolkit, psycopg2 +, pygments, sqlparse, pgspecial, setproctitle, keyring, pytest, mock +}: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "pgcli"; - version = "2.0.2"; + version = "2.1.1"; - # Python 2 won't have prompt_toolkit 2.x.x - # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408 - disabled = python3Packages.isPy27; + disabled = !isPy3k; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "1p4j2dbcfxd3kz86qi519jkqjx1mg5wdgn1gxdjx3lk1vpsd7x04"; + sha256 = "1jmnb8izsdjmq9cgajhfapr31wlhvcml4lakz2mcmjn355x83q44"; }; - patches = [ - (fetchpatch { - # TODO: Remove with next pgcli release. Fixes TypeError in tests - # https://github.com/dbcli/pgcli/pull/1006 - url = https://github.com/dbcli/pgcli/commit/351135b61ef9ad3184c49a406544708daf589fe3.patch; - sha256 = "08131y0lv1v760i0ypcx2hljx066ks93kp96xkv3bycxnavvcl53"; - excludes = [ "changelog.rst" ]; - }) - ]; - - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ cli-helpers click configobj humanize prompt_toolkit psycopg2 pygments sqlparse pgspecial setproctitle keyring ]; - checkInputs = with python3Packages; [ pytest mock ]; + checkInputs = [ pytest mock ]; - checkPhase = '' - pytest - ''; + # One test fails: https://github.com/dbcli/pgcli/issues/1104 + doCheck = false; + checkPhase = "pytest"; meta = with lib; { description = "Command-line interface for PostgreSQL"; |