Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-11-01 10:10:47 +01:00
63 changed files with 591 additions and 329 deletions
+4 -1
View File
@@ -7189,7 +7189,10 @@ in {
tomlkit = callPackage ../development/python-modules/tomlkit { };
toolz = callPackage ../development/python-modules/toolz { };
toolz = if isPy3k then
callPackage ../development/python-modules/toolz { }
else
callPackage ../development/python-modules/toolz/2.nix { };
toposort = callPackage ../development/python-modules/toposort { };