Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-08-07 23:01:57 +02:00
193 changed files with 4273 additions and 2231 deletions
+4
View File
@@ -631,6 +631,8 @@ in {
convertdate = callPackage ../development/python-modules/convertdate { };
cot = callPackage ../development/python-modules/cot { };
crc32c = callPackage ../development/python-modules/crc32c { };
curio = callPackage ../development/python-modules/curio { };
@@ -900,6 +902,8 @@ in {
itemadapter = callPackage ../development/python-modules/itemadapter { };
itemloaders = callPackage ../development/python-modules/itemloaders { };
iterm2 = callPackage ../development/python-modules/iterm2 { };
janus = callPackage ../development/python-modules/janus { };