From 473189e8e09de3325210726811171aad06d6dc74 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Tue, 23 May 2017 23:12:55 -0400 Subject: [PATCH] pgcli: 1.3.1 -> 1.5.1 --- .../tools/database/pgcli/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 38 ------------------ 3 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 pkgs/development/tools/database/pgcli/default.nix diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix new file mode 100644 index 00000000000..2b278e0416f --- /dev/null +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -0,0 +1,39 @@ +{ lib, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + name = "pgcli-${version}"; + version = "1.5.1"; + + src = fetchFromGitHub { + sha256 = "1wp8pzi9hwz16fpcr0mq3ffydwdscfg5whhzc91757dw995sgl0s"; + rev = "v${version}"; + repo = "pgcli"; + owner = "dbcli"; + }; + + buildInputs = with pythonPackages; [ pytest mock ]; + checkPhase = '' + py.test tests -k 'not test_missing_rc_dir and not test_quoted_db_uri and not test_port_db_uri' + ''; + + propagatedBuildInputs = with pythonPackages; [ + click configobj humanize prompt_toolkit psycopg2 + pygments sqlparse pgspecial setproctitle + ]; + + postPatch = '' + substituteInPlace setup.py --replace "==" ">=" + rm tests/test_rowlimit.py + ''; + + meta = with lib; { + description = "Command-line interface for PostgreSQL"; + longDescription = '' + Rich command-line interface for PostgreSQL with auto-completion and + syntax highlighting. + ''; + homepage = https://pgcli.com; + license = licenses.bsd3; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc97682b52c..d7bfd10ea3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6917,6 +6917,8 @@ with pkgs; peg = callPackage ../development/tools/parsing/peg { }; + pgcli = callPackage ../development/tools/database/pgcli {}; + phantomjs = callPackage ../development/tools/phantomjs { }; phantomjs2 = callPackage ../development/tools/phantomjs2 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a156b4accc9..f6ee950f745 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18184,44 +18184,6 @@ in { }; }; - pgcli = buildPythonPackage rec { - name = "pgcli-${version}"; - version = "1.3.1"; - - src = pkgs.fetchFromGitHub { - sha256 = "18i5pwli36d5d0xh1d7dc80iq85w7vcalphg8hipjclhg2h72bp0"; - rev = "v${version}"; - repo = "pgcli"; - owner = "dbcli"; - }; - - buildInputs = with self; [ pytest mock ]; - checkPhase = '' - py.test tests -k 'not test_missing_rc_dir and not test_quoted_db_uri and not test_port_db_uri' - ''; - - propagatedBuildInputs = with self; [ - click configobj humanize prompt_toolkit psycopg2 - pygments sqlparse pgspecial setproctitle - ]; - - postPatch = '' - substituteInPlace setup.py --replace "==" ">=" - rm tests/test_rowlimit.py - ''; - - meta = { - description = "Command-line interface for PostgreSQL"; - longDescription = '' - Rich command-line interface for PostgreSQL with auto-completion and - syntax highlighting. - ''; - homepage = http://pgcli.com; - license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; - }; - }; - pgspecial = buildPythonPackage rec { pname = "pgspecial"; version = "1.7.0";