Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-04-03 00:14:57 +00:00
committed by GitHub
60 changed files with 8100 additions and 2479 deletions
+2
View File
@@ -5966,6 +5966,8 @@ in {
pymeeus = callPackage ../development/python-modules/pymeeus { };
pymemcache = callPackage ../development/python-modules/pymemcache { };
pymemoize = callPackage ../development/python-modules/pymemoize { };
pyment = callPackage ../development/python-modules/pyment { };