From d69246709fbc37aecf321ff09372d9f58f1f4943 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Sat, 3 Nov 2018 22:03:40 -0400
Subject: [PATCH] pythonPackages.prompt_toolkit: 1.0.15 -> 2.0.7

Created a version to prompt_toolkit_1 for legacy ipython
---
 pkgs/applications/misc/haxor-news/default.nix     | 2 +-
 pkgs/applications/networking/gns3/server.nix      | 2 +-
 pkgs/development/python-modules/ipython/5.nix     | 4 ++--
 pkgs/development/tools/database/pgcli/default.nix | 2 +-
 pkgs/shells/xonsh/default.nix                     | 2 +-
 pkgs/tools/admin/aws_shell/default.nix            | 4 ++--
 pkgs/tools/admin/mycli/default.nix                | 2 +-
 pkgs/tools/networking/http-prompt/default.nix     | 2 +-
 pkgs/top-level/python-packages.nix                | 3 +--
 9 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index 1fa016627d4e..d840a754497a 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -16,7 +16,7 @@ buildPythonApplication rec {
     colorama
     requests
     pygments
-    prompt_toolkit
+    prompt_toolkit_1
     six
   ];
 
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 7717862f6a0a..fc5f9f217c03 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -57,7 +57,7 @@ in pythonPackages.buildPythonPackage rec {
     ++ (with pythonPackages; [
       yarl aiohttp multidict
       jinja2 psutil zipstream raven jsonschema typing
-      prompt_toolkit
+      prompt_toolkit_1
     ]);
 
   # Requires network access
diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix
index 58034eaacf04..a93a8c180155 100644
--- 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
+, prompt_toolkit_1
 , 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
+    backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit_1
     simplegeneric traitlets requests pathlib2 pexpect
   ] ++ lib.optionals stdenv.isDarwin [ appnope ];
 
diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix
index 73e343833383..650e1fc39e53 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/pkgs/development/tools/database/pgcli/default.nix
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
   };
 
   propagatedBuildInputs = with pythonPackages; [
-    cli-helpers click configobj humanize prompt_toolkit_2 psycopg2
+    cli-helpers click configobj humanize prompt_toolkit psycopg2
     pygments sqlparse pgspecial setproctitle keyring
   ];
 
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 32dfd56796d6..5848c0a453cd 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
 
   checkInputs = [ python3Packages.pytest glibcLocales git ];
 
-  propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit_2 pygments ];
+  propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit pygments ];
 
   meta = with stdenv.lib; {
     description = "A Python-ish, BASHwards-compatible shell";
diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix
index c319c47ea7e4..2fc961279661 100644
--- a/pkgs/tools/admin/aws_shell/default.nix
+++ b/pkgs/tools/admin/aws_shell/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , awscli
-, prompt_toolkit
+, prompt_toolkit_1
 , boto3
 , configobj
 , pygments
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   # Why does it propagate packages that are used for testing?
   propagatedBuildInputs = [
     awscli
-    prompt_toolkit
+    prompt_toolkit_1
     boto3
     configobj
     pygments
diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix
index d01dca459591..7bb9e6cd193c 100644
--- a/pkgs/tools/admin/mycli/default.nix
+++ b/pkgs/tools/admin/mycli/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   };
 
   propagatedBuildInputs = [
-    pymysql configobj sqlparse prompt_toolkit pygments click pycrypto cli-helpers
+    pymysql configobj sqlparse prompt_toolkit_1 pygments click pycrypto cli-helpers
   ];
 
   checkInputs = [ pytest mock glibcLocales ];
diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index 69b23b3e3a4c..3de9a76abbcd 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
     click
     httpie
     parsimonious
-    prompt_toolkit
+    prompt_toolkit_1
     pygments
     six
   ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 123d8b28e023..c63bd3a15207 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3260,10 +3260,9 @@ in {
 
   prettytable = callPackage ../development/python-modules/prettytable { };
 
-  prompt_toolkit = self.prompt_toolkit_1;
+  prompt_toolkit = self.prompt_toolkit_2;
 
   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 {