diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index d840a754497..1fa016627d4 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { colorama requests pygments - prompt_toolkit_1 + prompt_toolkit six ]; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index fc5f9f217c0..7717862f6a0 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -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 diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index a93a8c18015..58034eaacf0 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/jupyter_console/5.nix b/pkgs/development/python-modules/jupyter_console/5.nix index 57c4a9c96d9..46fe17ef63b 100644 --- a/pkgs/development/python-modules/jupyter_console/5.nix +++ b/pkgs/development/python-modules/jupyter_console/5.nix @@ -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 ]; diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix index 2fc96127966..c319c47ea7e 100644 --- a/pkgs/tools/admin/aws_shell/default.nix +++ b/pkgs/tools/admin/aws_shell/default.nix @@ -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 diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 7bb9e6cd193..d01dca45959 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -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 ]; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 3de9a76abbc..69b23b3e3a4 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { click httpie parsimonious - prompt_toolkit_1 + prompt_toolkit pygments six ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36c052a655f..7f43c53161b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 {};