diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2018-11-11 00:39:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-11 00:39:38 +0100 |
commit | fbc02d6ce44b1696ac94290b12de6b939c960b8e (patch) | |
tree | 435c5d033704919dcdb03e82de59aa1d2bec43e0 /pkgs/development | |
parent | cf1ce60c2081a987a6a2646f9f5ddfe99affab30 (diff) | |
parent | e15ef48c80f3415dabda5bd2d307a1a247d71888 (diff) | |
download | nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.tar nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.tar.gz nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.tar.bz2 nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.tar.lz nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.tar.xz nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.tar.zst nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.zip |
Merge pull request #49853 from marsam/feature/update-pgcli
pythonPackages.prompt_toolkit: init at 2.0.7 pgcli: 1.11.0 -> 2.0.0 xonsh: 0.6.8 -> 0.8.3 pythonPackages.ptpython: 0.41 -> 2.0.4
Diffstat (limited to 'pkgs/development')
4 files changed, 58 insertions, 27 deletions
diff --git a/pkgs/development/python-modules/prompt_toolkit/1.nix b/pkgs/development/python-modules/prompt_toolkit/1.nix new file mode 100644 index 000000000000..e9d44c83f1db --- /dev/null +++ b/pkgs/development/python-modules/prompt_toolkit/1.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, docopt +, six +, wcwidth +, pygments +}: + +buildPythonPackage rec { + pname = "prompt_toolkit"; + version = "1.0.15"; + + src = fetchPypi { + inherit pname version; + sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917"; + }; + checkPhase = '' + rm prompt_toolkit/win32_types.py + py.test -k 'not test_pathcompleter_can_expanduser' + ''; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ docopt six wcwidth pygments ]; + + meta = { + description = "Python library for building powerful interactive command lines"; + longDescription = '' + prompt_toolkit could be a replacement for readline, but it can be + much more than that. It is cross-platform, everything that you build + with it should run fine on both Unix and Windows systems. Also ships + with a nice interactive Python shell (called ptpython) built on top. + ''; + homepage = https://github.com/jonathanslenders/python-prompt-toolkit; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index 69a2f47d05ff..cd0df6c52be7 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -2,27 +2,24 @@ , buildPythonPackage , fetchPypi , pytest -, docopt , six , wcwidth -, pygments }: buildPythonPackage rec { pname = "prompt_toolkit"; - version = "1.0.15"; + version = "2.0.7"; src = fetchPypi { inherit pname version; - sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917"; + sha256 = "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx"; }; checkPhase = '' - rm prompt_toolkit/win32_types.py py.test -k 'not test_pathcompleter_can_expanduser' ''; checkInputs = [ pytest ]; - propagatedBuildInputs = [ docopt six wcwidth pygments ]; + propagatedBuildInputs = [ six wcwidth ]; meta = { description = "Python library for building powerful interactive command lines"; @@ -35,4 +32,4 @@ buildPythonPackage rec { homepage = https://github.com/jonathanslenders/python-prompt-toolkit; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index b553d50d130b..d48e42ef2646 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -1,17 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, wcwidth, six, prompt_toolkit, docopt -, jedi, pygments }: +{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments }: buildPythonPackage rec { pname = "ptpython"; - version = "0.41"; - name = "${pname}-${version}"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1hcaaadkp5n37hxggraynifa33wx1akklzvf6y4rvgjxbjl2g2x7"; + sha256 = "1m34jbwj3j3762mg1vynpgciqw4kqdzdqjvd62mwhbjkly7ddsgb"; }; - propagatedBuildInputs = [ wcwidth six prompt_toolkit docopt jedi pygments ]; + propagatedBuildInputs = [ prompt_toolkit docopt jedi pygments ]; # no tests to run doCheck = false; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index bc1c2515bfa7..73e343833383 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,27 +1,25 @@ { lib, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { - name = "pgcli-${version}"; - version = "1.11.0"; + pname = "pgcli"; + version = "2.0.0"; - src = fetchFromGitHub { - owner = "dbcli"; - repo = "pgcli"; - rev = "v${version}"; - sha256 = "01qcvl0iwabinq3sb4340js8v3sbwkbxi64sg4xy76wj8xr6kgsk"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "085fna5nc72nfj1gw0m4ia6wzayinqaffmjy3ajldha1727vqwzi"; }; - buildInputs = with pythonPackages; [ pytest mock ]; - checkPhase = '' - mkdir /tmp/homeless-shelter - HOME=/tmp/homeless-shelter py.test tests -k 'not test_missing_rc_dir and not test_quoted_db_uri and not test_port_db_uri' - ''; - propagatedBuildInputs = with pythonPackages; [ - cli-helpers click configobj humanize prompt_toolkit psycopg2 + cli-helpers click configobj humanize prompt_toolkit_2 psycopg2 pygments sqlparse pgspecial setproctitle keyring ]; + checkInputs = with pythonPackages; [ pytest mock ]; + + checkPhase = '' + py.test + ''; + meta = with lib; { description = "Command-line interface for PostgreSQL"; longDescription = '' |