Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2021-03-05 20:38:56 +01:00
30 changed files with 253 additions and 54 deletions
+3 -1
View File
@@ -8065,7 +8065,7 @@ in {
transmission-rpc = callPackage ../development/python-modules/transmission-rpc { };
transmissionrpc = self.transmission-rpc; # alias for compatibility 2020-02-07
transmissionrpc = callPackage ../development/python-modules/transmissionrpc { };
treq = callPackage ../development/python-modules/treq { };
@@ -8434,6 +8434,8 @@ in {
web = callPackage ../development/python-modules/web { };
web-cache = callPackage ../development/python-modules/web-cache { };
webcolors = callPackage ../development/python-modules/webcolors { };
webdavclient3 = callPackage ../development/python-modules/webdavclient3 { };