Merge master into staging-next

2020-06-05 19:40:53 +02:00
parent f9af74e75a 5f0bd4d70f
commit 43f71029cc
101 changed files with 2204 additions and 1267 deletions
--- a/lib/minver.nix
+++ b/lib/minver.nix
@@ -1,2 +1,2 @@
 # Expose the minimum required version for evaluating Nixpkgs
-"2.0"
+"2.2"