From dd28c62879cc4903ac4da18ad32a850b878f62a2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Nov 2011 16:39:13 +0000 Subject: [PATCH] * My grep skills are lacking. svn path=/nixos/trunk/; revision=30335 --- modules/installer/cd-dvd/installation-cd-base.nix | 1 - modules/installer/cd-dvd/installation-cd-minimal.nix | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix index 7dae6ac2cf56..96d1faaad0f5 100644 --- a/modules/installer/cd-dvd/installation-cd-base.nix +++ b/modules/installer/cd-dvd/installation-cd-base.nix @@ -36,7 +36,6 @@ in # Profiles of this basic installation CD. ../../profiles/all-hardware.nix ../../profiles/base.nix - # ../../profiles/minimal.nix # should include this, but then the graphical CD will also get it. ../../profiles/installation-device.nix ]; diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix index c166e3f4ad03..f568f2462a02 100644 --- a/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -1,11 +1,11 @@ # This module defines a small NixOS installation CD. It does not # contain any graphical stuff. -{config, pkgs, ...}: +{ config, pkgs, ... }: { - require = [ - ./installation-cd-base.nix - ../../profiles/minimal.nix - ]; + require = + [ ./installation-cd-base.nix + ../../profiles/minimal.nix + ]; }