about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2018-11-11 00:39:38 +0100
committerGitHub <noreply@github.com>2018-11-11 00:39:38 +0100
commitfbc02d6ce44b1696ac94290b12de6b939c960b8e (patch)
tree435c5d033704919dcdb03e82de59aa1d2bec43e0 /pkgs/top-level
parentcf1ce60c2081a987a6a2646f9f5ddfe99affab30 (diff)
parente15ef48c80f3415dabda5bd2d307a1a247d71888 (diff)
downloadnixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.tar
nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.tar.gz
nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.tar.bz2
nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.tar.lz
nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.tar.xz
nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.tar.zst
nixlib-fbc02d6ce44b1696ac94290b12de6b939c960b8e.zip
Merge pull request #49853 from marsam/feature/update-pgcli
pythonPackages.prompt_toolkit: init at 2.0.7
pgcli: 1.11.0 -> 2.0.0
xonsh: 0.6.8 -> 0.8.3
pythonPackages.ptpython: 0.41 -> 2.0.4
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/python-packages.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 905e6ccec2d6..bf1f9ebdff5e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3755,8 +3755,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;
@@ -3776,7 +3779,9 @@ in {
 
   psycopg2 = callPackage ../development/python-modules/psycopg2 {};
 
-  ptpython = callPackage ../development/python-modules/ptpython {};
+  ptpython = callPackage ../development/python-modules/ptpython {
+    prompt_toolkit = self.prompt_toolkit_2;
+  };
 
   publicsuffix = callPackage ../development/python-modules/publicsuffix {};