diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-26 02:00:04 -0800 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-26 02:00:04 -0800 |
| commit | a26a796d5c7fa305e007c2b5229e0521c8b3fb0f (patch) | |
| tree | 6c35defae305b0da581f757b72b461a8f6052620 /nixos/modules/installer | |
| parent | ad8fde5e5d9bc25a54ac238f485e28b37d6d185a (diff) | |
| parent | 142696de884213e01cc518af813a20d2e2ece3cc (diff) | |
| download | nixpkgs-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.tar nixpkgs-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.tar.gz nixpkgs-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.tar.bz2 nixpkgs-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.tar.lz nixpkgs-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.tar.xz nixpkgs-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.tar.zst nixpkgs-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.zip | |
Merging against master - updating smokingpig, rebase was going to be messy
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-minimal.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/nix-fallback-paths.nix | 6 |
2 files changed, 3 insertions, 8 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/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index ddc624a77de..d73d67ef472 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"; } |