Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-13 18:32:50 +00:00
committed by GitHub
46 changed files with 274 additions and 121 deletions
+2
View File
@@ -2727,6 +2727,8 @@ in {
glasgow = callPackage ../development/python-modules/glasgow { };
glcontext = callPackage ../development/python-modules/glcontext { };
glob2 = callPackage ../development/python-modules/glob2 { };
globre = callPackage ../development/python-modules/globre { };