public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python.pkgs.prompt_toolkit: always use 1 with py2 and 2 with py3

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-11-21 12:37:26 +01:00
parent ed6befe2f2
commit f0b49c4d10
8 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/haxor-news/default.nix
View File

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

2
pkgs/applications/networking/gns3/server.nix
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_1 prompt_toolkit
]); ]);
# Requires network access # Requires network access

4
pkgs/development/python-modules/ipython/5.nix
View File

@ -19,7 +19,7 @@
, requests , requests
, simplegeneric , simplegeneric
, traitlets , traitlets
, prompt_toolkit_1 , prompt_toolkit
, 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_1 backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit
simplegeneric traitlets requests pathlib2 pexpect simplegeneric traitlets requests pathlib2 pexpect
] ++ lib.optionals stdenv.isDarwin [ appnope ]; ] ++ lib.optionals stdenv.isDarwin [ appnope ];

4
pkgs/development/python-modules/jupyter_console/5.nix
View File

@ -5,7 +5,7 @@
, jupyter_client , jupyter_client
, ipython , ipython
, ipykernel , ipykernel
, prompt_toolkit_1 , prompt_toolkit
, pygments , pygments
}: }:
@ -23,7 +23,7 @@ buildPythonPackage rec {
jupyter_client jupyter_client
ipython ipython
ipykernel ipykernel
prompt_toolkit_1 prompt_toolkit
pygments pygments
]; ];

4
pkgs/tools/admin/aws_shell/default.nix
View File

@ -2,7 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, awscli , awscli
, prompt_toolkit_1 , prompt_toolkit
, 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_1 prompt_toolkit
boto3 boto3
configobj configobj
pygments pygments

2
pkgs/tools/admin/mycli/default.nix
View File

@ -15,7 +15,7 @@ buildPythonApplication rec {
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
pymysql configobj sqlparse prompt_toolkit_1 pygments click pycrypto cli-helpers pymysql configobj sqlparse prompt_toolkit pygments click pycrypto cli-helpers
]; ];
checkInputs = [ pytest mock glibcLocales ]; checkInputs = [ pytest mock glibcLocales ];

2
pkgs/tools/networking/http-prompt/default.nix
View File

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

9
pkgs/top-level/python-packages.nix
View File

@ -3268,10 +3268,9 @@ in {
prettytable = callPackage ../development/python-modules/prettytable { }; prettytable = callPackage ../development/python-modules/prettytable { };
prompt_toolkit = self.prompt_toolkit_2; prompt_toolkit = let
filename = if isPy3k then ../development/python-modules/prompt_toolkit else ../development/python-modules/prompt_toolkit/1.nix;
prompt_toolkit_1 = callPackage ../development/python-modules/prompt_toolkit/1.nix { }; in callPackage filename { };
prompt_toolkit_2 = callPackage ../development/python-modules/prompt_toolkit { };
protobuf = callPackage ../development/python-modules/protobuf { protobuf = callPackage ../development/python-modules/protobuf {
disabled = isPyPy; disabled = isPyPy;
@ -3286,7 +3285,7 @@ in {
psycopg2 = callPackage ../development/python-modules/psycopg2 {}; psycopg2 = callPackage ../development/python-modules/psycopg2 {};
ptpython = callPackage ../development/python-modules/ptpython { ptpython = callPackage ../development/python-modules/ptpython {
prompt_toolkit = self.prompt_toolkit_2; prompt_toolkit = self.prompt_toolkit;
}; };
publicsuffix = callPackage ../development/python-modules/publicsuffix {}; publicsuffix = callPackage ../development/python-modules/publicsuffix {};