Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2021-05-14 01:40:09 +02:00
46 changed files with 274 additions and 121 deletions
+2
View File
@@ -2729,6 +2729,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 { };