diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index fc9607e7be6b..f5a723f59018 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -7,7 +7,7 @@ let self = py; # not compatible with prompt_toolkit >=2.0 - prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { + prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { name = "${oldAttrs.pname}-${version}"; version = "1.0.18"; src = oldAttrs.src.override { @@ -37,7 +37,7 @@ buildPythonApplication rec { colorama requests pygments - prompt_toolkit + prompt-toolkit six ]; diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 3ea3511308b2..c591c969ca9b 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { arrow icalendar glibcLocales - prompt_toolkit + prompt-toolkit urwid watchdog ]; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 47bf0eb106bf..761467088218 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -31,7 +31,7 @@ in python.pkgs.buildPythonPackage { propagatedBuildInputs = with python.pkgs; [ aiohttp-cors yarl aiohttp multidict setuptools jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles - prompt_toolkit py-cpuinfo + prompt-toolkit py-cpuinfo ]; # Requires network access diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 214675349936..7cfa889d2803 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, - prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, + prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, setuptools, fetchpatch, installShellFiles, pytest, faker, pytest-aiohttp, aioresponses, @@ -40,7 +40,7 @@ buildPythonApplication rec { Logbook matrix-nio peewee - prompt_toolkit + prompt-toolkit setuptools ] ++ lib.optional enableDbusUi [ dbus-python diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index 88c793f9cb57..535dd22c515a 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -4,7 +4,7 @@ , colorama , fetchPypi , minikerberos -, prompt_toolkit +, prompt-toolkit , pycryptodomex , pythonOlder , six @@ -27,7 +27,7 @@ buildPythonPackage rec { asysocks colorama minikerberos - prompt_toolkit + prompt-toolkit pycryptodomex six tqdm diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index ec4cffe0d39f..84665ecb0950 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, click, prompt_toolkit }: +{ lib, buildPythonPackage, fetchPypi, click, prompt-toolkit }: buildPythonPackage rec { pname = "click-repl"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8"; }; - propagatedBuildInputs = [ click prompt_toolkit ]; + propagatedBuildInputs = [ click prompt-toolkit ]; meta = with lib; { homepage = "https://github.com/click-contrib/click-repl"; diff --git a/pkgs/development/python-modules/clickhouse-cli/default.nix b/pkgs/development/python-modules/clickhouse-cli/default.nix index 07ddca0680a1..68d69023e25d 100644 --- a/pkgs/development/python-modules/clickhouse-cli/default.nix +++ b/pkgs/development/python-modules/clickhouse-cli/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , click -, prompt_toolkit +, prompt-toolkit , pygments , requests , sqlparse @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click - prompt_toolkit + prompt-toolkit pygments requests sqlparse diff --git a/pkgs/development/python-modules/clintermission/default.nix b/pkgs/development/python-modules/clintermission/default.nix index 04e97f4c6693..a0e5dcb7142f 100644 --- a/pkgs/development/python-modules/clintermission/default.nix +++ b/pkgs/development/python-modules/clintermission/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, prompt_toolkit }: +{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, prompt-toolkit }: buildPythonApplication rec { pname = "clintermission"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "09wl0rpw6c9hab51rs957z64b0v9j4fcbqbn726wnapf4z5w6yxv"; }; - propagatedBuildInputs = [ prompt_toolkit ]; + propagatedBuildInputs = [ prompt-toolkit ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 55eadddaa1d6..e964f2abaaa0 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -7,7 +7,7 @@ , mypy , pygments , pytestCheckHook -, prompt_toolkit +, prompt-toolkit , tkinter , watchdog }: @@ -23,7 +23,7 @@ buildPythonApplication rec { sha256 = "1pz13vza3yy95dbylnq89fzc3mwgcqr7ds096wy25k6vxd9dp9c3"; }; - propagatedBuildInputs = [ cpyparsing pygments prompt_toolkit ipykernel mypy watchdog ]; + propagatedBuildInputs = [ cpyparsing pygments prompt-toolkit ipykernel mypy watchdog ]; patches = [ (fetchpatch { diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index a75ceaa0b76d..45096bf77816 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 +, prompt-toolkit , pexpect , appnope }: @@ -51,7 +51,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 simplegeneric traitlets requests pathlib2 pexpect ] ++ lib.optionals stdenv.isDarwin [ appnope ]; diff --git a/pkgs/development/python-modules/ipython/7.16.nix b/pkgs/development/python-modules/ipython/7.16.nix index 9700737f485e..d0ca5eef7cde 100644 --- a/pkgs/development/python-modules/ipython/7.16.nix +++ b/pkgs/development/python-modules/ipython/7.16.nix @@ -13,7 +13,7 @@ , decorator , pickleshare , traitlets -, prompt_toolkit +, prompt-toolkit , pexpect , appnope , backcall @@ -43,7 +43,7 @@ buildPythonPackage rec { decorator pickleshare traitlets - prompt_toolkit + prompt-toolkit pygments pexpect backcall diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index cd68bb62a12e..e036a3378643 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -14,7 +14,7 @@ , matplotlib-inline , pickleshare , traitlets -, prompt_toolkit +, prompt-toolkit , pexpect , appnope , backcall @@ -45,7 +45,7 @@ buildPythonPackage rec { matplotlib-inline pickleshare traitlets - prompt_toolkit + prompt-toolkit pygments pexpect backcall diff --git a/pkgs/development/python-modules/jupyter_console/5.nix b/pkgs/development/python-modules/jupyter_console/5.nix index 440f22b13321..2072b24a3781 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 +, prompt-toolkit , pygments }: @@ -23,7 +23,7 @@ buildPythonPackage rec { jupyter_client ipython ipykernel - prompt_toolkit + prompt-toolkit pygments ]; diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index 22e057a5654e..2858f008c2ce 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -5,7 +5,7 @@ , jupyter_client , ipython , ipykernel -, prompt_toolkit +, prompt-toolkit , pygments , pythonOlder }: @@ -24,7 +24,7 @@ buildPythonPackage rec { jupyter_client ipython ipykernel - prompt_toolkit + prompt-toolkit pygments ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index 649276ef252f..f0e6e5abaa99 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -4,7 +4,7 @@ , asn1crypto , asysocks , minikerberos -, prompt_toolkit +, prompt-toolkit , tqdm , winacl , winsspi @@ -23,7 +23,7 @@ buildPythonPackage rec { asn1crypto asysocks minikerberos - prompt_toolkit + prompt-toolkit tqdm winacl winsspi diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 72eb9a185d7a..1805172f4d7d 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -2,7 +2,7 @@ , requests, filetype, pyparsing, configparser, arxiv2bib , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , click, python-slugify, habanero, isbnlib, typing-extensions -, prompt_toolkit, pygments, stevedore, tqdm, lxml +, prompt-toolkit, pygments, stevedore, tqdm, lxml , python-doi, isPy3k, pytest-cov #, optional, dependencies , whoosh, pytest @@ -26,7 +26,7 @@ buildPythonPackage rec { requests filetype pyparsing configparser arxiv2bib pyyaml chardet beautifulsoup4 colorama bibtexparser click python-slugify habanero isbnlib - prompt_toolkit pygments typing-extensions + prompt-toolkit pygments typing-extensions stevedore tqdm lxml python-doi # optional dependencies diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 65915c858696..2e8bde6f5367 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -4,7 +4,7 @@ , importlib-metadata , isPy3k , jedi -, prompt_toolkit +, prompt-toolkit , pygments }: @@ -22,7 +22,7 @@ buildPythonPackage rec { appdirs black # yes, this is in install_requires jedi - prompt_toolkit + prompt-toolkit pygments ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index 98182ddf68c7..ba39dc536e2f 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , click , fetchFromGitHub -, prompt_toolkit +, prompt-toolkit , pycryptodome , pythonOlder }: @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp click - prompt_toolkit + prompt-toolkit pycryptodome ]; diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 46b60419ad8c..b96c5f8d15da 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -5,7 +5,7 @@ , click , fetchFromGitHub , mock -, prompt_toolkit +, prompt-toolkit , pygments , pyserial , pyserial-asyncio @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp click - prompt_toolkit + prompt-toolkit pygments pyserial pyserial-asyncio diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index d7f93b3a47e5..27619b785459 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , poetry -, prompt_toolkit +, prompt-toolkit , pytest-cov , pytestCheckHook }: @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - prompt_toolkit + prompt-toolkit ]; checkInputs = [ diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 78ecb3face30..d21311362716 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -5,7 +5,7 @@ , ptable , click , requests -, prompt_toolkit +, prompt-toolkit , pygments , urllib3 , pytest @@ -20,9 +20,9 @@ buildPythonPackage rec { version = "5.8.4"; disabled = isPy27; - propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ]; + propagatedBuildInputs = [ ptable click requests prompt-toolkit pygments urllib3 ]; - checkInputs = [ pytest pytest-cov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ]; + checkInputs = [ pytest pytest-cov mock sphinx testtools ptable click requests prompt-toolkit pygments urllib3 ]; checkPhase = '' pytest diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index 75e600ccb513..b2a96ab0dc53 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { cli-helpers click configobj - prompt_toolkit + prompt-toolkit pygments sqlparse ]; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index cc7524e3a437..62db92380ae2 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -6,7 +6,7 @@ , click , configobj , humanize -, prompt_toolkit +, prompt-toolkit , psycopg2 , pygments , sqlparse @@ -34,7 +34,7 @@ buildPythonApplication rec { click configobj humanize - prompt_toolkit + prompt-toolkit psycopg2 pygments sqlparse diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index a2cc4206620e..c73cb2872024 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { checkInputs = [ python3Packages.pytest python3Packages.pytest-rerunfailures glibcLocales git ]; - propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit pygments ]; + propagatedBuildInputs = with python3Packages; [ ply prompt-toolkit pygments ]; meta = with lib; { description = "A Python-ish, BASHwards-compatible shell"; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index d84c1816fec4..762eab4eb0b6 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -11,7 +11,7 @@ let sha256 = "sha256-iAZmqnffqrmFuxlQyOpEQzSCcL/hRAjuXKulOXoy4hY="; }; }); - prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { + prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { version = "2.0.10"; src = oldAttrs.src.override { inherit version; @@ -62,7 +62,7 @@ with py.pkgs; buildPythonApplication rec { docutils groff less - prompt_toolkit + prompt-toolkit pyyaml rsa ruamel_yaml diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index ca845cce1456..e128b9803c20 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { configobj importlib-resources paramiko - prompt_toolkit + prompt-toolkit pyaes pycrypto pygments diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix index 5e1ca0242bc6..6f40c08dd163 100644 --- a/pkgs/tools/misc/piston-cli/default.nix +++ b/pkgs/tools/misc/piston-cli/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "qvDGVJcaMXUajdUQWl4W1dost8k0PsS9XX/o8uQrtfY="; }; - propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml more-itertools ]; + propagatedBuildInputs = with python3Packages; [ rich prompt-toolkit requests pygments pyyaml more-itertools ]; checkPhase = '' $out/bin/piston --help > /dev/null diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 3732fbd879f5..3f42fa83c64f 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { click httpie parsimonious - (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) + (python.pkgs.callPackage ../../../development/python-modules/prompt-toolkit/1.nix {}) pygments six ]; diff --git a/pkgs/tools/security/onlykey-cli/default.nix b/pkgs/tools/security/onlykey-cli/default.nix index b342f203b44c..51cb815db6f0 100644 --- a/pkgs/tools/security/onlykey-cli/default.nix +++ b/pkgs/tools/security/onlykey-cli/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { # Requires having the physical onlykey (a usb security key) doCheck = false; propagatedBuildInputs = - with python3Packages; [ hidapi aenum six prompt_toolkit pynacl ecdsa cython ]; + with python3Packages; [ hidapi aenum six prompt-toolkit pynacl ecdsa cython ]; meta = with lib; { description = "OnlyKey client and command-line tool"; diff --git a/pkgs/tools/security/xcat/default.nix b/pkgs/tools/security/xcat/default.nix index 516585f89126..f5fa23d19007 100644 --- a/pkgs/tools/security/xcat/default.nix +++ b/pkgs/tools/security/xcat/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { cchardet click colorama - prompt_toolkit + prompt-toolkit xpath-expressions ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 294c90f66566..0622f791bf3a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -53,6 +53,7 @@ mapAliases ({ lammps-cython = throw "no longer builds and is unmaintained"; MechanicalSoup = mechanicalsoup; # added 2021-06-01 privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 + prompt_toolkit = prompt-toolkit; pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pytestcov = pytest-cov; # added 2021-01-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80fec6354089..92b1da99446e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5603,7 +5603,7 @@ in { promise = callPackage ../development/python-modules/promise { }; - prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { }; + prompt-toolkit = callPackage ../development/python-modules/prompt-toolkit { }; property-manager = callPackage ../development/python-modules/property-manager { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 48ddb18291af..643306648525 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -403,7 +403,7 @@ with self; with super; { progressbar231 = callPackage ../development/python-modules/progressbar231 { }; - prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit/1.nix { }; + prompt-toolkit = callPackage ../development/python-modules/prompt-toolkit/1.nix { }; pyamf = callPackage ../development/python-modules/pyamf { };