Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-08-24 11:56:04 +02:00
139 changed files with 1638 additions and 845 deletions
+6
View File
@@ -1560,6 +1560,8 @@ in {
sabyenc = callPackage ../development/python-modules/sabyenc { };
sabyenc3 = callPackage ../development/python-modules/sabyenc3 { };
salmon-mail = callPackage ../development/python-modules/salmon-mail { };
sanic-auth = callPackage ../development/python-modules/sanic-auth { };
@@ -6750,6 +6752,8 @@ in {
terminaltables = callPackage ../development/python-modules/terminaltables { };
test-tube = callPackage ../development/python-modules/test-tube { };
testpath = callPackage ../development/python-modules/testpath { };
testrepository = callPackage ../development/python-modules/testrepository { };
@@ -7837,6 +7841,8 @@ in {
rxv = callPackage ../development/python-modules/rxv { };
userpath = callPackage ../development/python-modules/userpath { };
});
in fix' (extends overrides packages)