From 96b69689500e96364abe35fdd6ed324eee5e462f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Jan 2017 11:34:21 +0100 Subject: nix: 1.11.5 -> 1.11.6 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nixos/modules/installer') diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index ddc624a77de9..d73d67ef4728 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,5 @@ { - x86_64-linux = "/nix/store/m8z91vpfxyszhjpq4wl8m1zwlqik4fkn-nix-1.11.5"; - i686-linux = "/nix/store/vk71likl32igqg6apqsj52ln3vhkq1pa-nix-1.11.5"; - x86_64-darwin = "/nix/store/qfwm0b5qkr8v8gsv9dh2z3arky9p1myg-nix-1.11.5"; + x86_64-linux = "/nix/store/qdkzm17csr24snk247a1s0c47ikq5sl6-nix-1.11.6"; + i686-linux = "/nix/store/hiwp53747lxlniqy5wpbql5izjrs8z0z-nix-1.11.6"; + x86_64-darwin = "/nix/store/hca2hqcvwncf23hiqyqgwbsdy8vvl9xv-nix-1.11.6"; } -- cgit 1.4.1 From f4f4200d9ad497efaf4366cfb95112aee20cc32e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 18 Jan 2017 17:54:42 +0100 Subject: 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) --- nixos/modules/installer/cd-dvd/installation-cd-minimal.nix | 5 ----- nixos/modules/profiles/installation-device.nix | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'nixos/modules/installer') diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index f4122ab0e518..7ec55f159d0e 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 7949e600f86a..b2973d88b157 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 ]; }; } -- cgit 1.4.1