Merge branch 'master' into staging-next

minor conflict: rust update vs. darwin fixes for it
  (not tested but seems quite OK)
This commit is contained in:
Vladimír Čunát
2020-10-21 13:34:06 +02:00
41 changed files with 652 additions and 302 deletions
+2
View File
@@ -7687,6 +7687,8 @@ in {
yahooweather = callPackage ../development/python-modules/yahooweather { };
yamale = callPackage ../development/python-modules/yamale { };
yamllint = callPackage ../development/python-modules/yamllint { };
yamlordereddictloader = callPackage ../development/python-modules/yamlordereddictloader { };