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

This commit is contained in:
Martin Weinelt
2021-05-08 14:43:43 +02:00
657 changed files with 2572 additions and 1628 deletions
+2 -2
View File
@@ -3281,8 +3281,6 @@ in {
influxgraph = callPackage ../development/python-modules/influxgraph { };
infoqscraper = callPackage ../development/python-modules/infoqscraper { };
inform = callPackage ../development/python-modules/inform { };
iniconfig = callPackage ../development/python-modules/iniconfig { };
@@ -7177,6 +7175,8 @@ in {
rsa = callPackage ../development/python-modules/rsa { };
rst2ansi = callPackage ../development/python-modules/rst2ansi { };
rtmidi-python = callPackage ../development/python-modules/rtmidi-python { };
Rtree = callPackage ../development/python-modules/Rtree {