python.pkgs.prompt_toolkit: always use 1 with py2 and 2 with py3

2018-11-21 12:37:26 +01:00
parent ed6befe2f2
commit f0b49c4d10
8 changed files with 15 additions and 16 deletions
--- a/pkgs/development/python-modules/ipython/5.nix
+++ b/pkgs/development/python-modules/ipython/5.nix
@@ -19,7 +19,7 @@
 , requests
 , simplegeneric
 , traitlets
-, prompt_toolkit_1
+, prompt_toolkit
 , pexpect
 , appnope
 }:
@@ -42,7 +42,7 @@ buildPythonPackage rec {
  checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock;

  propagatedBuildInputs = [
-    backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit_1
+    backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit
    simplegeneric traitlets requests pathlib2 pexpect
  ] ++ lib.optionals stdenv.isDarwin [ appnope ];

--- a/pkgs/development/python-modules/jupyter_console/5.nix
+++ b/pkgs/development/python-modules/jupyter_console/5.nix
@@ -5,7 +5,7 @@
 , jupyter_client
 , ipython
 , ipykernel
-, prompt_toolkit_1
+, prompt_toolkit
 , pygments
 }:

@@ -23,7 +23,7 @@ buildPythonPackage rec {
    jupyter_client
    ipython
    ipykernel
-    prompt_toolkit_1
+    prompt_toolkit
    pygments
  ];