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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 397ae5c362f3..7d8415049a44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3757,8 +3757,11 @@ in { }; }; + prompt_toolkit = self.prompt_toolkit_1; - prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { }; + prompt_toolkit_1 = callPackage ../development/python-modules/prompt_toolkit/1.nix { }; + + prompt_toolkit_2 = callPackage ../development/python-modules/prompt_toolkit { }; protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy;