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 colorama
requests requests
pygments pygments
prompt_toolkit prompt_toolkit_1
six six
]; ];

View File

@ -57,7 +57,7 @@ in pythonPackages.buildPythonPackage rec {
++ (with pythonPackages; [ ++ (with pythonPackages; [
yarl aiohttp multidict yarl aiohttp multidict
jinja2 psutil zipstream raven jsonschema typing jinja2 psutil zipstream raven jsonschema typing
prompt_toolkit prompt_toolkit_1
]); ]);
# Requires network access # Requires network access

View File

@ -19,7 +19,7 @@
, requests , requests
, simplegeneric , simplegeneric
, traitlets , traitlets
, prompt_toolkit , prompt_toolkit_1
, pexpect , pexpect
, appnope , appnope
}: }:
@ -42,7 +42,7 @@ buildPythonPackage rec {
checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock; checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock;
propagatedBuildInputs = [ 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 simplegeneric traitlets requests pathlib2 pexpect
] ++ lib.optionals stdenv.isDarwin [ appnope ]; ] ++ lib.optionals stdenv.isDarwin [ appnope ];

View File

@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
}; };
propagatedBuildInputs = with pythonPackages; [ 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 pygments sqlparse pgspecial setproctitle keyring
]; ];

View File

@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
checkInputs = [ python3Packages.pytest glibcLocales git ]; checkInputs = [ python3Packages.pytest glibcLocales git ];
propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit_2 pygments ]; propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit pygments ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A Python-ish, BASHwards-compatible shell"; description = "A Python-ish, BASHwards-compatible shell";

View File

@ -2,7 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, awscli , awscli
, prompt_toolkit , prompt_toolkit_1
, boto3 , boto3
, configobj , configobj
, pygments , pygments
@ -20,7 +20,7 @@ buildPythonPackage rec {
# Why does it propagate packages that are used for testing? # Why does it propagate packages that are used for testing?
propagatedBuildInputs = [ propagatedBuildInputs = [
awscli awscli
prompt_toolkit prompt_toolkit_1
boto3 boto3
configobj configobj
pygments pygments

View File

@ -15,7 +15,7 @@ buildPythonApplication rec {
}; };
propagatedBuildInputs = [ 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 ]; checkInputs = [ pytest mock glibcLocales ];

View File

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

View File

@ -3260,10 +3260,9 @@ in {
prettytable = callPackage ../development/python-modules/prettytable { }; 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_1 = callPackage ../development/python-modules/prompt_toolkit/1.nix { };
prompt_toolkit_2 = callPackage ../development/python-modules/prompt_toolkit { }; prompt_toolkit_2 = callPackage ../development/python-modules/prompt_toolkit { };
protobuf = callPackage ../development/python-modules/protobuf { protobuf = callPackage ../development/python-modules/protobuf {