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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-18 08:57:16 -07:00
parent c227fb4b17 d189df235a
commit f7a112f6c4
264 changed files with 3781 additions and 1606 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+28 -2
View File
@@ -351,6 +351,8 @@ in {
aiowinreg = callPackage ../development/python-modules/aiowinreg { };
aioymaps = callPackage ../development/python-modules/aioymaps { };
aiozeroconf = callPackage ../development/python-modules/aiozeroconf { };
airly = callPackage ../development/python-modules/airly { };
@@ -1725,6 +1727,8 @@ in {
datrie = callPackage ../development/python-modules/datrie { };
dawg-python = callPackage ../development/python-modules/dawg-python { };
dbf = callPackage ../development/python-modules/dbf { };
dbfread = callPackage ../development/python-modules/dbfread { };
@@ -3021,6 +3025,8 @@ in {
ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { };
ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs{ };
halo = callPackage ../development/python-modules/halo { };
handout = callPackage ../development/python-modules/handout { };
@@ -4779,6 +4785,8 @@ in {
ovh = callPackage ../development/python-modules/ovh { };
ovoenergy = callPackage ../development/python-modules/ovoenergy { };
owslib = callPackage ../development/python-modules/owslib { };
oyaml = callPackage ../development/python-modules/oyaml { };
@@ -5205,6 +5213,8 @@ in {
praw = callPackage ../development/python-modules/praw { };
prayer-times-calculator = callPackage ../development/python-modules/prayer-times-calculator { };
precis-i18n = callPackage ../development/python-modules/precis-i18n { };
pre-commit = callPackage ../development/python-modules/pre-commit { };
@@ -5496,6 +5506,8 @@ in {
pycparser = callPackage ../development/python-modules/pycparser { };
py-canary = callPackage ../development/python-modules/py-canary { };
py-cid = callPackage ../development/python-modules/py-cid { };
py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { };
@@ -5535,6 +5547,8 @@ in {
pydeconz = callPackage ../development/python-modules/pydeconz { };
pydelijn = callPackage ../development/python-modules/pydelijn { };
pydenticon = callPackage ../development/python-modules/pydenticon { };
pydexcom = callPackage ../development/python-modules/pydexcom { };
@@ -5879,6 +5893,10 @@ in {
pymongo = callPackage ../development/python-modules/pymongo { };
pymorphy2 = callPackage ../development/python-modules/pymorphy2 { };
pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2/dicts-ru.nix { };
pympler = callPackage ../development/python-modules/pympler { };
pymsgbox = callPackage ../development/python-modules/pymsgbox { };
@@ -5943,6 +5961,8 @@ in {
pynzb = callPackage ../development/python-modules/pynzb { };
pyobihai = callPackage ../development/python-modules/pyobihai { };
pyocr = callPackage ../development/python-modules/pyocr {
tesseract = pkgs.tesseract4;
};
@@ -7620,8 +7640,6 @@ in {
slicerator = callPackage ../development/python-modules/slicerator { };
slimit = callPackage ../development/python-modules/slimit { };
slither-analyzer = callPackage ../development/python-modules/slither-analyzer { };
slixmpp = callPackage ../development/python-modules/slixmpp {
@@ -7718,10 +7736,16 @@ in {
spacy = callPackage ../development/python-modules/spacy { };
spacy-alignments = callPackage ../development/python-modules/spacy-alignments { };
spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { };
spacy_models = callPackage ../development/python-modules/spacy/models.nix { };
spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { };
spacy-transformers = callPackage ../development/python-modules/spacy-transformers { };
spake2 = callPackage ../development/python-modules/spake2 { };
spark_parser = callPackage ../development/python-modules/spark_parser { };
@@ -8713,6 +8737,8 @@ in {
websockify = callPackage ../development/python-modules/websockify { };
webssh = callPackage ../development/python-modules/webssh { };
webtest = callPackage ../development/python-modules/webtest { };
webthing = callPackage ../development/python-modules/webthing { };