diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2023-07-08 20:49:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-08 20:49:37 +0200 |
| commit | a1d0ee8c505472625e1c48a73843447269878bf0 (patch) | |
| tree | 3f87fcb659fff2f1a68d00add9e7d2c59cbaabff | |
| parent | 61afc4d1662fe426f02b28e386f2e053f887b6d6 (diff) | |
nixos/nix-channel: Apply suggestions from code review
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
| -rw-r--r-- | nixos/modules/config/nix-channel.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index f90da62ec834e..8f6caaabde86a 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -85,7 +85,7 @@ in fi ''; - environment.extraSetup = mkIf (! cfg.channel.enable) '' + environment.extraSetup = mkIf (!cfg.channel.enable) '' rm $out/bin/nix-channel ''; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 5c6b70732fea6..4941eb9a6ebad 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -300,13 +300,11 @@ let rm /etc/nixos/configuration.nix """) machine.copy_from_host_via_shell( - "${ makeConfig { - inherit bootLoader grubDevice grubIdentifier - grubUseEfi extraConfig; - forceGrubReinstallCount = 1; - flake = true; - } - }", + "${makeConfig { + inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig; + forceGrubReinstallCount = 1; + flake = true; + }}", "/root/my-config/configuration.nix", ) machine.copy_from_host_via_shell( @@ -366,7 +364,6 @@ let ${postBootCommands} machine.shutdown() - ''; |