Merge pull request #46823 from dywedir/pgcli

pgcli: 1.6.0 -> 1.10.3, pythonPackages.pgspecial: 1.8.0 -> 1.11.2

2 files changed, 32 insertions, 11 deletions

diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
new file mode 100644
index 000000000000..84ccea15e98f
--- /dev/null
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }:
+
+buildPythonPackage rec {
+  pname = "pgspecial";
+  version = "1.11.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1yq3cmpdcvwsz3nifc0db125433vxbgbpmbhxfj46b9s5k81xs30";
+  };
+
+  buildInputs = [ pytest psycopg2 ];
+  propagatedBuildInputs = [ click sqlparse ];
+
+  checkPhase = ''
+    find tests -name \*.pyc -delete
+    py.test tests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Meta-commands handler for Postgres Database";
+    homepage = https://pypi.python.org/pypi/pgspecial;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix
index 4ea3589476bd..2926946cd45a 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/pkgs/development/tools/database/pgcli/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "pgcli-${version}";
-  version = "1.6.0";
+  version = "1.10.3";
 
   src = fetchFromGitHub {
-    sha256 = "0f1zv4kwi2991pclf8chrhgjwf8jkqxdh5ndc9qx6igh56iyyncz";
-    rev = "v${version}";
-    repo = "pgcli";
     owner = "dbcli";
+    repo = "pgcli";
+    rev = "v${version}";
+    sha256 = "1qcbv2w036l0gc0li3jpa6amxzqmhv8d1q6wv4pfh0wvl17hqv9r";
   };
 
   buildInputs = with pythonPackages; [ pytest mock ];
@@ -18,15 +18,10 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = with pythonPackages; [
-    click configobj humanize prompt_toolkit psycopg2
-    pygments sqlparse pgspecial setproctitle
+    cli-helpers click configobj humanize prompt_toolkit psycopg2
+    pygments sqlparse pgspecial setproctitle keyring
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py --replace "==" ">="
-    rm tests/test_rowlimit.py
-  '';
-
   meta = with lib; {
     description = "Command-line interface for PostgreSQL";
     longDescription = ''
@@ -35,5 +30,6 @@ pythonPackages.buildPythonApplication rec {
     '';
     homepage = https://pgcli.com;
     license = licenses.bsd3;
+    maintainers = with maintainers; [ dywedir ];
   };
 }