summary refs log tree commit diff
path: root/pkgs/os-specific/linux/nixos-rebuild
diff options
context:
space:
mode:
authorThéophane Hufschmitt <regnat@users.noreply.github.com>2021-05-16 16:17:42 +0200
committerGitHub <noreply@github.com>2021-05-16 16:17:42 +0200
commit601ceec28d443255f76c48499ec2c446d135a712 (patch)
treea1f0a4b05a2d8ee28661a0bb3ef799eeabcff956 /pkgs/os-specific/linux/nixos-rebuild
parentc58b97674b12d238d9d21e8ab9ee9d7a6b81ae8f (diff)
downloadnixpkgs-601ceec28d443255f76c48499ec2c446d135a712.tar
nixpkgs-601ceec28d443255f76c48499ec2c446d135a712.tar.gz
nixpkgs-601ceec28d443255f76c48499ec2c446d135a712.tar.bz2
nixpkgs-601ceec28d443255f76c48499ec2c446d135a712.tar.lz
nixpkgs-601ceec28d443255f76c48499ec2c446d135a712.tar.xz
nixpkgs-601ceec28d443255f76c48499ec2c446d135a712.tar.zst
nixpkgs-601ceec28d443255f76c48499ec2c446d135a712.zip
nixos-rebuild: Don’t reset the experimental features
Make sure that the Nix `experimental-features` set by a user aren’t overwritten when running `nixos-rebuild --flake` by using `--extra-experimental-features` rather than `--experimental-features`.

Fix https://github.com/NixOS/nix/issues/4784
Diffstat (limited to 'pkgs/os-specific/linux/nixos-rebuild')
-rw-r--r--pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
index 01d0fa823b9..afc0b8a3222 100644
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -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)