Merge master into staging-next

2021-05-16 18:32:41 +00:00
parent 684991c696 805825cc52
commit 8c6d819143
40 changed files with 156 additions and 139 deletions
@@ -105,7 +105,7 @@ while [ "$#" -gt 0 ]; do
        ;;
      --flake)
        flake="$1"
-        flakeFlags=(--experimental-features 'nix-command flakes')
+        flakeFlags=(--extra-experimental-features 'nix-command flakes')
        shift 1
        ;;
      --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file)