Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-11 00:48:15 +00:00
committed by GitHub
69 changed files with 4881 additions and 8823 deletions
+4
View File
@@ -4277,6 +4277,8 @@ in {
mortgage = callPackage ../development/python-modules/mortgage { };
motioneye-client = callPackage ../development/python-modules/motioneye-client { };
moto = callPackage ../development/python-modules/moto { };
moviepy = callPackage ../development/python-modules/moviepy { };
@@ -7222,6 +7224,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;
};