about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-07-28 10:18:46 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-07-28 10:19:23 +0200
commitc9dca79fda70cf4b39a18d845d69ff2b103a4eca (patch)
tree01943a8580229671482c7505b05f6de978cbf689
parentdd7e291b5f885e98378f91c575b28b9b29871499 (diff)
downloadnixlib-c9dca79fda70cf4b39a18d845d69ff2b103a4eca.tar
nixlib-c9dca79fda70cf4b39a18d845d69ff2b103a4eca.tar.gz
nixlib-c9dca79fda70cf4b39a18d845d69ff2b103a4eca.tar.bz2
nixlib-c9dca79fda70cf4b39a18d845d69ff2b103a4eca.tar.lz
nixlib-c9dca79fda70cf4b39a18d845d69ff2b103a4eca.tar.xz
nixlib-c9dca79fda70cf4b39a18d845d69ff2b103a4eca.tar.zst
nixlib-c9dca79fda70cf4b39a18d845d69ff2b103a4eca.zip
Revert "python.pkgs.ipython: allow prompt_toolkit 2.0"
Too many packages still rely on prompt_toolkit 1.x. Therefore, that bump was reverted. That also meant this had to be reverted.

This reverts commit 178b84c10d36cab7912c36d3fe266062254d8a72.
-rw-r--r--pkgs/development/python-modules/ipython/default.nix7
1 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index 24a938b195b2..2c0e4aaf4db6 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -3,7 +3,6 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
-, fetchpatch
 # Build dependencies
 , glibcLocales
 # Test dependencies
@@ -35,12 +34,6 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "'gnureadline'" " "
   '';
 
-  # Upgrade to prompt_toolkit 2.0
-  patches = fetchpatch {
-    url = https://github.com/ipython/ipython/commit/8e256bd37373f98580ba1ef1d3fcfd7976802238.patch;
-    sha256 = "1d9qy2z21n4frf15g4aj7xi011d1d3qc31gs27f2v23j0gv69r9h";
-  };
-
   buildInputs = [ glibcLocales ];
 
   checkInputs = [ nose pygments ];