mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 05:00:16 +00:00
Code Issues 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
requests
pygments
prompt_toolkit_1
prompt_toolkit
six
];

2
pkgs/applications/networking/gns3/server.nix
View file

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

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

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

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

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

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

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

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

@ -15,7 +15,7 @@ buildPythonApplication rec {
};
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 ];

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

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

11
pkgs/top-level/python-packages.nix
View file

@ -196,7 +196,7 @@ in {
astropy = callPackage ../development/python-modules/astropy { };
astroquery = callPackage ../development/python-modules/astroquery { };
astroquery = callPackage ../development/python-modules/astroquery { };
atom = callPackage ../development/python-modules/atom { };
@ -3268,10 +3268,9 @@ in {
prettytable = callPackage ../development/python-modules/prettytable { };
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 { };
prompt_toolkit = let
filename = if isPy3k then ../development/python-modules/prompt_toolkit else ../development/python-modules/prompt_toolkit/1.nix;
in callPackage filename { };
protobuf = callPackage ../development/python-modules/protobuf {
disabled = isPyPy;
@ -3286,7 +3285,7 @@ in {
psycopg2 = callPackage ../development/python-modules/psycopg2 {};
ptpython = callPackage ../development/python-modules/ptpython {
prompt_toolkit = self.prompt_toolkit_2;
prompt_toolkit = self.prompt_toolkit;
};
publicsuffix = callPackage ../development/python-modules/publicsuffix {};