Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2021-05-11 09:09:10 +02:00
224 changed files with 6308 additions and 10564 deletions
+14
View File
@@ -4291,6 +4291,8 @@ in {
mortgage = callPackage ../development/python-modules/mortgage { };
motioneye-client = callPackage ../development/python-modules/motioneye-client { };
moto = callPackage ../development/python-modules/moto { };
motor = callPackage ../development/python-modules/motor { };
@@ -4367,6 +4369,8 @@ in {
mutatormath = callPackage ../development/python-modules/mutatormath { };
mutesync = callPackage ../development/python-modules/mutesync { };
mwclient = callPackage ../development/python-modules/mwclient { };
mwdblib = callPackage ../development/python-modules/mwdblib { };
@@ -5432,6 +5436,10 @@ in {
pycfdns = callPackage ../development/python-modules/pycfdns { };
pycflow2dot = callPackage ../development/python-modules/pycflow2dot {
inherit (pkgs) graphviz;
};
pychannels = callPackage ../development/python-modules/pychannels { };
pychart = callPackage ../development/python-modules/pychart { };
@@ -5737,6 +5745,8 @@ in {
pykodi = callPackage ../development/python-modules/pykodi { };
pykoplenti = callPackage ../development/python-modules/pykoplenti { };
pykwalify = callPackage ../development/python-modules/pykwalify { };
pylacrosse = callPackage ../development/python-modules/pylacrosse { };
@@ -5837,6 +5847,8 @@ in {
pymetar = callPackage ../development/python-modules/pymetar { };
pymeteireann = callPackage ../development/python-modules/pymeteireann { };
pymetno = callPackage ../development/python-modules/pymetno { };
pymitv = callPackage ../development/python-modules/pymitv { };
@@ -7238,6 +7250,8 @@ in {
rtmidi-python = callPackage ../development/python-modules/rtmidi-python { };
rtoml = callPackage ../development/python-modules/rtoml { };
Rtree = callPackage ../development/python-modules/Rtree {
inherit (pkgs) libspatialindex;
};