From ed7516c96c078ca90ab0a5f1952d45f53391a1ee Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 26 Dec 2020 04:20:00 +0000 Subject: [PATCH] pgcli: 3.0.0 -> 3.1.0 --- .../tools/database/pgcli/default.nix | 63 +++++++++++-------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 36a85e6361c..b4c26d6fb5c 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,52 +1,61 @@ -{ buildPythonApplication, lib, fetchPypi, isPy3k, fetchpatch -, cli-helpers, click, configobj, humanize, prompt_toolkit, psycopg2 -, pygments, sqlparse, pgspecial, setproctitle, keyring, pytest, mock +{ stdenv +, buildPythonApplication +, fetchPypi +, isPy3k +, cli-helpers +, click +, configobj +, humanize +, prompt_toolkit +, psycopg2 +, pygments +, sqlparse +, pgspecial +, setproctitle +, keyring +, pendulum +, pytestCheckHook +, mock }: buildPythonApplication rec { pname = "pgcli"; - version = "3.0.0"; + version = "3.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "10j01bd031fys1vcihibsi5rrfd8w1kgahpcsbk4l07871c24829"; + sha256 = "d5b2d803f7e4e7fe679306a000bde5d14d15ec590ddd108f3dc4c0ecad169d2b"; }; propagatedBuildInputs = [ - cli-helpers click configobj humanize prompt_toolkit psycopg2 - pygments sqlparse pgspecial setproctitle keyring + cli-helpers + click + configobj + humanize + prompt_toolkit + psycopg2 + pygments + sqlparse + pgspecial + setproctitle + keyring + pendulum ]; - patches = [ - (fetchpatch { - name = "enable-sqlparse-4.patch"; - url = "https://github.com/dbcli/pgcli/pull/1224/commits/55d534d41051887c637b6300e08a9f70e6656020.patch"; - sha256 = "01r8qc7qzb6mz0xq2xnrgyackbapf43ng6l88qpzd9lw2pwksc8w"; - includes = [ "pgcli/packages/parseutils/ctes.py" "tests/test_sqlcompletion.py" "setup.py" ]; - }) - ]; + checkInputs = [ pytestCheckHook mock ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit" - ''; + disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; - checkInputs = [ pytest mock ]; - - # `test_application_name_db_uri` fails: https://github.com/dbcli/pgcli/issues/1104 - checkPhase = '' - pytest --deselect=tests/test_main.py::test_application_name_db_uri - ''; - - meta = with lib; { + meta = with stdenv.lib; { description = "Command-line interface for PostgreSQL"; longDescription = '' Rich command-line interface for PostgreSQL with auto-completion and syntax highlighting. ''; homepage = "https://pgcli.com"; + changelog = "https://github.com/dbcli/pgcli/blob/v${version}/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ dywedir ]; };