Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-11-01 10:11:12 +01:00
362 changed files with 5122 additions and 3783 deletions
+16 -1
View File
@@ -322,6 +322,8 @@ in {
antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; };
anyio = callPackage ../development/python-modules/anyio { };
anyjson = callPackage ../development/python-modules/anyjson { };
anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; };
@@ -426,10 +428,14 @@ in {
async_generator = callPackage ../development/python-modules/async_generator { };
asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { };
asyncpg = callPackage ../development/python-modules/asyncpg { };
asyncssh = callPackage ../development/python-modules/asyncssh { };
async_stagger = callPackage ../development/python-modules/async_stagger { };
asynctest = callPackage ../development/python-modules/asynctest { };
async-timeout = callPackage ../development/python-modules/async_timeout { };
@@ -2985,6 +2991,12 @@ in {
irc = callPackage ../development/python-modules/irc { };
ircrobots = callPackage ../development/python-modules/ircrobots { };
ircstates = callPackage ../development/python-modules/ircstates { };
irctokens = callPackage ../development/python-modules/irctokens { };
isbnlib = callPackage ../development/python-modules/isbnlib { };
islpy = callPackage ../development/python-modules/islpy { };
@@ -7177,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 { };