From 3dbbd9f8c221949e442a4803981cd6d1aed24be8 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Thu, 29 Nov 2018 23:19:51 -0800 Subject: [PATCH] pgcli: 2.0.0 -> 2.0.1 Changelog: https://github.com/dbcli/pgcli/blob/master/changelog.rst#201 Major feature of note is Python 3.7 support. Also default to using Python 3 because this is an application. --- .../tools/database/pgcli/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 650e1fc39e53..f9e60e3e492c 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,23 +1,27 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pgcli"; - version = "2.0.0"; + version = "2.0.1"; - src = pythonPackages.fetchPypi { + # 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; + + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "085fna5nc72nfj1gw0m4ia6wzayinqaffmjy3ajldha1727vqwzi"; + sha256 = "149naq3gp1n922vag7vixs0hd114bpbmbmv70k4kzc1q7jz748l2"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ cli-helpers click configobj humanize prompt_toolkit psycopg2 pygments sqlparse pgspecial setproctitle keyring ]; - checkInputs = with pythonPackages; [ pytest mock ]; + checkInputs = with python3Packages; [ pytest mock ]; checkPhase = '' - py.test + pytest ''; meta = with lib; {