about summary refs log tree commit diff
path: root/pkgs/development/python-modules/ipython/default.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-07-27 08:06:38 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-07-27 08:06:38 +0200
commitdd7e291b5f885e98378f91c575b28b9b29871499 (patch)
tree2e53b770fc8d551f4e9c1c4dff1cedcb11cf9cc1 /pkgs/development/python-modules/ipython/default.nix
parented445b68d1a0b034104f1ea1bc762611954b49c4 (diff)
parent3877501f9da61025f21abf22c40e6a6a81d04afd (diff)
downloadnixlib-dd7e291b5f885e98378f91c575b28b9b29871499.tar
nixlib-dd7e291b5f885e98378f91c575b28b9b29871499.tar.gz
nixlib-dd7e291b5f885e98378f91c575b28b9b29871499.tar.bz2
nixlib-dd7e291b5f885e98378f91c575b28b9b29871499.tar.lz
nixlib-dd7e291b5f885e98378f91c575b28b9b29871499.tar.xz
nixlib-dd7e291b5f885e98378f91c575b28b9b29871499.tar.zst
nixlib-dd7e291b5f885e98378f91c575b28b9b29871499.zip
Merge staging into staging-next
Diffstat (limited to 'pkgs/development/python-modules/ipython/default.nix')
-rw-r--r--pkgs/development/python-modules/ipython/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index 2c0e4aaf4db6..24a938b195b2 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -3,6 +3,7 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
+, fetchpatch
 # Build dependencies
 , glibcLocales
 # Test dependencies
@@ -34,6 +35,12 @@ 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 ];