alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pythonPackages: normalise prompt_toolkit

Browse source
This commit is contained in:
Sandro Jäckel 2021-07-22 17:02:31 +02:00
parent 8dfc51d9c3
commit 183c7ebcae
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
33 changed files with 55 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/haxor-news/default.nix
View file

@ -7,7 +7,7 @@ let
self = py; self = py;
# not compatible with prompt_toolkit >=2.0 # 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}"; name = "${oldAttrs.pname}-${version}";
version = "1.0.18"; version = "1.0.18";
src = oldAttrs.src.override { src = oldAttrs.src.override {
@ -37,7 +37,7 @@ buildPythonApplication rec {
colorama colorama
requests requests
pygments pygments
prompt_toolkit prompt-toolkit
six six
]; ];

2
pkgs/applications/misc/topydo/default.nix
View file

@ -17,7 +17,7 @@ buildPythonApplication rec {
arrow arrow
icalendar icalendar
glibcLocales glibcLocales
prompt_toolkit prompt-toolkit
urwid urwid
watchdog watchdog
]; ];

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

@ -31,7 +31,7 @@ in python.pkgs.buildPythonPackage {
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python.pkgs; [
aiohttp-cors yarl aiohttp multidict setuptools aiohttp-cors yarl aiohttp multidict setuptools
jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles
prompt_toolkit py-cpuinfo prompt-toolkit py-cpuinfo
]; ];
# Requires network access # Requires network access

4
pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder,
attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, 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, setuptools, fetchpatch, installShellFiles,
pytest, faker, pytest-aiohttp, aioresponses, pytest, faker, pytest-aiohttp, aioresponses,
@ -40,7 +40,7 @@ buildPythonApplication rec {
Logbook Logbook
matrix-nio matrix-nio
peewee peewee
prompt_toolkit prompt-toolkit
setuptools setuptools
] ++ lib.optional enableDbusUi [ ] ++ lib.optional enableDbusUi [
dbus-python dbus-python

4
pkgs/development/python-modules/aiosmb/default.nix
View file

@ -4,7 +4,7 @@
, colorama , colorama
, fetchPypi , fetchPypi
, minikerberos , minikerberos
, prompt_toolkit , prompt-toolkit
, pycryptodomex , pycryptodomex
, pythonOlder , pythonOlder
, six , six
@ -27,7 +27,7 @@ buildPythonPackage rec {
asysocks asysocks
colorama colorama
minikerberos minikerberos
prompt_toolkit prompt-toolkit
pycryptodomex pycryptodomex
six six
tqdm tqdm

4
pkgs/development/python-modules/click-repl/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, click, prompt_toolkit }: { lib, buildPythonPackage, fetchPypi, click, prompt-toolkit }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "click-repl"; pname = "click-repl";
@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8"; sha256 = "cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8";
}; };
propagatedBuildInputs = [ click prompt_toolkit ]; propagatedBuildInputs = [ click prompt-toolkit ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/click-contrib/click-repl"; homepage = "https://github.com/click-contrib/click-repl";

4
pkgs/development/python-modules/clickhouse-cli/default.nix
View file

@ -2,7 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, click , click
, prompt_toolkit , prompt-toolkit
, pygments , pygments
, requests , requests
, sqlparse , sqlparse
@ -19,7 +19,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
click click
prompt_toolkit prompt-toolkit
pygments pygments
requests requests
sqlparse sqlparse

4
pkgs/development/python-modules/clintermission/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, prompt_toolkit }: { lib, buildPythonApplication, fetchFromGitHub, isPy3k, prompt-toolkit }:
buildPythonApplication rec { buildPythonApplication rec {
pname = "clintermission"; pname = "clintermission";
@ -11,7 +11,7 @@ buildPythonApplication rec {
sha256 = "09wl0rpw6c9hab51rs957z64b0v9j4fcbqbn726wnapf4z5w6yxv"; sha256 = "09wl0rpw6c9hab51rs957z64b0v9j4fcbqbn726wnapf4z5w6yxv";
}; };
propagatedBuildInputs = [ prompt_toolkit ]; propagatedBuildInputs = [ prompt-toolkit ];
disabled = !isPy3k; disabled = !isPy3k;

4
pkgs/development/python-modules/coconut/default.nix
View file

@ -7,7 +7,7 @@
, mypy , mypy
, pygments , pygments
, pytestCheckHook , pytestCheckHook
, prompt_toolkit , prompt-toolkit
, tkinter , tkinter
, watchdog , watchdog
}: }:
@ -23,7 +23,7 @@ buildPythonApplication rec {
sha256 = "1pz13vza3yy95dbylnq89fzc3mwgcqr7ds096wy25k6vxd9dp9c3"; sha256 = "1pz13vza3yy95dbylnq89fzc3mwgcqr7ds096wy25k6vxd9dp9c3";
}; };
propagatedBuildInputs = [ cpyparsing pygments prompt_toolkit ipykernel mypy watchdog ]; propagatedBuildInputs = [ cpyparsing pygments prompt-toolkit ipykernel mypy watchdog ];
patches = [ patches = [
(fetchpatch { (fetchpatch {

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

@ -19,7 +19,7 @@
, requests , requests
, simplegeneric , simplegeneric
, traitlets , traitlets
, prompt_toolkit , prompt-toolkit
, pexpect , pexpect
, appnope , appnope
}: }:
@ -51,7 +51,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
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/ipython/7.16.nix
View file

@ -13,7 +13,7 @@
, decorator , decorator
, pickleshare , pickleshare
, traitlets , traitlets
, prompt_toolkit , prompt-toolkit
, pexpect , pexpect
, appnope , appnope
, backcall , backcall
@ -43,7 +43,7 @@ buildPythonPackage rec {
decorator decorator
pickleshare pickleshare
traitlets traitlets
prompt_toolkit prompt-toolkit
pygments pygments
pexpect pexpect
backcall backcall

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

@ -14,7 +14,7 @@
, matplotlib-inline , matplotlib-inline
, pickleshare , pickleshare
, traitlets , traitlets
, prompt_toolkit , prompt-toolkit
, pexpect , pexpect
, appnope , appnope
, backcall , backcall
@ -45,7 +45,7 @@ buildPythonPackage rec {
matplotlib-inline matplotlib-inline
pickleshare pickleshare
traitlets traitlets
prompt_toolkit prompt-toolkit
pygments pygments
pexpect pexpect
backcall backcall

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 , prompt-toolkit
, pygments , pygments
}: }:
@ -23,7 +23,7 @@ buildPythonPackage rec {
jupyter_client jupyter_client
ipython ipython
ipykernel ipykernel
prompt_toolkit prompt-toolkit
pygments pygments
]; ];

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

@ -5,7 +5,7 @@
, jupyter_client , jupyter_client
, ipython , ipython
, ipykernel , ipykernel
, prompt_toolkit , prompt-toolkit
, pygments , pygments
, pythonOlder , pythonOlder
}: }:
@ -24,7 +24,7 @@ buildPythonPackage rec {
jupyter_client jupyter_client
ipython ipython
ipykernel ipykernel
prompt_toolkit prompt-toolkit
pygments pygments
]; ];
checkInputs = [ nose ]; checkInputs = [ nose ];

4
pkgs/development/python-modules/msldap/default.nix
View file

@ -4,7 +4,7 @@
, asn1crypto , asn1crypto
, asysocks , asysocks
, minikerberos , minikerberos
, prompt_toolkit , prompt-toolkit
, tqdm , tqdm
, winacl , winacl
, winsspi , winsspi
@ -23,7 +23,7 @@ buildPythonPackage rec {
asn1crypto asn1crypto
asysocks asysocks
minikerberos minikerberos
prompt_toolkit prompt-toolkit
tqdm tqdm
winacl winacl
winsspi winsspi

4
pkgs/development/python-modules/papis/default.nix
View file

@ -2,7 +2,7 @@
, requests, filetype, pyparsing, configparser, arxiv2bib , requests, filetype, pyparsing, configparser, arxiv2bib
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
, click, python-slugify, habanero, isbnlib, typing-extensions , click, python-slugify, habanero, isbnlib, typing-extensions
, prompt_toolkit, pygments, stevedore, tqdm, lxml , prompt-toolkit, pygments, stevedore, tqdm, lxml
, python-doi, isPy3k, pytest-cov , python-doi, isPy3k, pytest-cov
#, optional, dependencies #, optional, dependencies
, whoosh, pytest , whoosh, pytest
@ -26,7 +26,7 @@ buildPythonPackage rec {
requests filetype pyparsing configparser arxiv2bib requests filetype pyparsing configparser arxiv2bib
pyyaml chardet beautifulsoup4 colorama bibtexparser pyyaml chardet beautifulsoup4 colorama bibtexparser
click python-slugify habanero isbnlib click python-slugify habanero isbnlib
prompt_toolkit pygments typing-extensions prompt-toolkit pygments typing-extensions
stevedore tqdm lxml stevedore tqdm lxml
python-doi python-doi
# optional dependencies # optional dependencies

4
pkgs/development/python-modules/ptpython/default.nix
View file

@ -4,7 +4,7 @@
, importlib-metadata , importlib-metadata
, isPy3k , isPy3k
, jedi , jedi
, prompt_toolkit , prompt-toolkit
, pygments , pygments
}: }:
@ -22,7 +22,7 @@ buildPythonPackage rec {
appdirs appdirs
black # yes, this is in install_requires black # yes, this is in install_requires
jedi jedi
prompt_toolkit prompt-toolkit
pygments pygments
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];

4
pkgs/development/python-modules/pykoplenti/default.nix
View file

@ -3,7 +3,7 @@
, buildPythonPackage , buildPythonPackage
, click , click
, fetchFromGitHub , fetchFromGitHub
, prompt_toolkit , prompt-toolkit
, pycryptodome , pycryptodome
, pythonOlder , pythonOlder
}: }:
@ -23,7 +23,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp aiohttp
click click
prompt_toolkit prompt-toolkit
pycryptodome pycryptodome
]; ];

4
pkgs/development/python-modules/pymodbus/default.nix
View file

@ -5,7 +5,7 @@
, click , click
, fetchFromGitHub , fetchFromGitHub
, mock , mock
, prompt_toolkit , prompt-toolkit
, pygments , pygments
, pyserial , pyserial
, pyserial-asyncio , pyserial-asyncio
@ -31,7 +31,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp aiohttp
click click
prompt_toolkit prompt-toolkit
pygments pygments
pyserial pyserial
pyserial-asyncio pyserial-asyncio

4
pkgs/development/python-modules/questionary/default.nix
View file

@ -2,7 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, poetry , poetry
, prompt_toolkit , prompt-toolkit
, pytest-cov , pytest-cov
, pytestCheckHook , pytestCheckHook
}: }:
@ -24,7 +24,7 @@ buildPythonPackage rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
prompt_toolkit prompt-toolkit
]; ];
checkInputs = [ checkInputs = [

6
pkgs/development/python-modules/softlayer/default.nix
View file

@ -5,7 +5,7 @@
, ptable , ptable
, click , click
, requests , requests
, prompt_toolkit , prompt-toolkit
, pygments , pygments
, urllib3 , urllib3
, pytest , pytest
@ -20,9 +20,9 @@ buildPythonPackage rec {
version = "5.8.4"; version = "5.8.4";
disabled = isPy27; 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 = '' checkPhase = ''
pytest pytest

2
pkgs/development/tools/database/litecli/default.nix
View file

@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
cli-helpers cli-helpers
click click
configobj configobj
prompt_toolkit prompt-toolkit
pygments pygments
sqlparse sqlparse
]; ];

4
pkgs/development/tools/database/pgcli/default.nix
View file

@ -6,7 +6,7 @@
, click , click
, configobj , configobj
, humanize , humanize
, prompt_toolkit , prompt-toolkit
, psycopg2 , psycopg2
, pygments , pygments
, sqlparse , sqlparse
@ -34,7 +34,7 @@ buildPythonApplication rec {
click click
configobj configobj
humanize humanize
prompt_toolkit prompt-toolkit
psycopg2 psycopg2
pygments pygments
sqlparse sqlparse

2
pkgs/shells/xonsh/default.nix
View file

@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec {
checkInputs = [ python3Packages.pytest python3Packages.pytest-rerunfailures glibcLocales git ]; 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; { meta = with lib; {
description = "A Python-ish, BASHwards-compatible shell"; description = "A Python-ish, BASHwards-compatible shell";

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

@ -11,7 +11,7 @@ let
sha256 = "sha256-iAZmqnffqrmFuxlQyOpEQzSCcL/hRAjuXKulOXoy4hY="; sha256 = "sha256-iAZmqnffqrmFuxlQyOpEQzSCcL/hRAjuXKulOXoy4hY=";
}; };
}); });
prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec {
version = "2.0.10"; version = "2.0.10";
src = oldAttrs.src.override { src = oldAttrs.src.override {
inherit version; inherit version;
@ -62,7 +62,7 @@ with py.pkgs; buildPythonApplication rec {
docutils docutils
groff groff
less less
prompt_toolkit prompt-toolkit
pyyaml pyyaml
rsa rsa
ruamel_yaml ruamel_yaml

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

@ -20,7 +20,7 @@ buildPythonApplication rec {
configobj configobj
importlib-resources importlib-resources
paramiko paramiko
prompt_toolkit prompt-toolkit
pyaes pyaes
pycrypto pycrypto
pygments pygments

2
pkgs/tools/misc/piston-cli/default.nix
View file

@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
sha256 = "qvDGVJcaMXUajdUQWl4W1dost8k0PsS9XX/o8uQrtfY="; 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 = '' checkPhase = ''
$out/bin/piston --help > /dev/null $out/bin/piston --help > /dev/null

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

@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
click click
httpie httpie
parsimonious parsimonious
(python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) (python.pkgs.callPackage ../../../development/python-modules/prompt-toolkit/1.nix {})
pygments pygments
six six
]; ];

2
pkgs/tools/security/onlykey-cli/default.nix
View file

@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
# Requires having the physical onlykey (a usb security key) # Requires having the physical onlykey (a usb security key)
doCheck = false; doCheck = false;
propagatedBuildInputs = propagatedBuildInputs =
with python3Packages; [ hidapi aenum six prompt_toolkit pynacl ecdsa cython ]; with python3Packages; [ hidapi aenum six prompt-toolkit pynacl ecdsa cython ];
meta = with lib; { meta = with lib; {
description = "OnlyKey client and command-line tool"; description = "OnlyKey client and command-line tool";

2
pkgs/tools/security/xcat/default.nix
View file

@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
cchardet cchardet
click click
colorama colorama
prompt_toolkit prompt-toolkit
xpath-expressions xpath-expressions
]; ];

1
pkgs/top-level/python-aliases.nix
View file

@ -53,6 +53,7 @@ mapAliases ({
lammps-cython = throw "no longer builds and is unmaintained"; lammps-cython = throw "no longer builds and is unmaintained";
MechanicalSoup = mechanicalsoup; # added 2021-06-01 MechanicalSoup = mechanicalsoup; # added 2021-06-01
privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 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 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 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
pytestcov = pytest-cov; # added 2021-01-04 pytestcov = pytest-cov; # added 2021-01-04

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

@ -5603,7 +5603,7 @@ in {
promise = callPackage ../development/python-modules/promise { }; 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 { }; property-manager = callPackage ../development/python-modules/property-manager { };

2
pkgs/top-level/python2-packages.nix
View file

@ -403,7 +403,7 @@ with self; with super; {
progressbar231 = callPackage ../development/python-modules/progressbar231 { }; 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 { }; pyamf = callPackage ../development/python-modules/pyamf { };