pythonPackages.prompt_toolkit: 1.0.15 -> 2.0.7

Created a version to prompt_toolkit_1 for legacy ipython
This commit is contained in:
Chris Ostrouchov 2018-11-03 22:03:40 -04:00 committed by Frederik Rietdijk
parent 189acf712d
commit d69246709f
9 changed files with 11 additions and 12 deletions

View file

@ -16,7 +16,7 @@ buildPythonApplication rec {
colorama
requests
pygments
prompt_toolkit
prompt_toolkit_1
six
];

View file

@ -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

View file

@ -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 ];

View file

@ -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
];

View file

@ -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";

View file

@ -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

View file

@ -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 ];

View file

@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
click
httpie
parsimonious
prompt_toolkit
prompt_toolkit_1
pygments
six
];

View file

@ -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 {