diff options
| author | Robin Gloster <mail@glob.in> | 2017-01-18 17:54:42 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-18 17:57:31 +0100 |
| commit | f4f4200d9ad497efaf4366cfb95112aee20cc32e (patch) | |
| tree | 63db7aae415edd5a7e92ff54d3df69ed71f321f2 /nixos | |
| parent | 460b43dbfe8f21253637be350eb1ef1d586eaf5e (diff) | |
| download | nixpkgs-f4f4200d9ad497efaf4366cfb95112aee20cc32e.tar nixpkgs-f4f4200d9ad497efaf4366cfb95112aee20cc32e.tar.gz nixpkgs-f4f4200d9ad497efaf4366cfb95112aee20cc32e.tar.bz2 nixpkgs-f4f4200d9ad497efaf4366cfb95112aee20cc32e.tar.lz nixpkgs-f4f4200d9ad497efaf4366cfb95112aee20cc32e.tar.xz nixpkgs-f4f4200d9ad497efaf4366cfb95112aee20cc32e.tar.zst nixpkgs-f4f4200d9ad497efaf4366cfb95112aee20cc32e.zip | |
install-devices: add vim
This moves vim to the install-device profile to add vim to netboot, too. Fixes #20013 (see discussion there for further information)
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-minimal.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/profiles/installation-device.nix | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index f4122ab0e51..7ec55f159d0 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -7,9 +7,4 @@ imports = [ ./installation-cd-base.nix ]; - - environment.systemPackages = - [ - pkgs.vim - ]; } diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 7949e600f86..b2973d88b15 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -76,5 +76,6 @@ with lib; boot.consoleLogLevel = mkDefault 7; networking.firewall.logRefusedConnections = mkDefault false; + environment.systemPackages = [ pkgs.vim ]; }; } |