From b69dd8759c0035ff889c2563c4afc6729e552874 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Nov 2011 16:29:40 +0000 Subject: [PATCH] * minimal.nix: don't include base.nix. Also note it's not currently used. svn path=/nixos/trunk/; revision=30333 --- modules/installer/cd-dvd/installation-cd-base.nix | 1 + modules/profiles/minimal.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix index 96d1faaad0f..7dae6ac2cf5 100644 --- a/modules/installer/cd-dvd/installation-cd-base.nix +++ b/modules/installer/cd-dvd/installation-cd-base.nix @@ -36,6 +36,7 @@ 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/profiles/minimal.nix b/modules/profiles/minimal.nix index acc56d94edc..7288b447f5d 100644 --- a/modules/profiles/minimal.nix +++ b/modules/profiles/minimal.nix @@ -1,11 +1,9 @@ # This module defines a small NixOS configuration. It does not # contain any graphical stuff. -{config, pkgs, ...}: +{ config, pkgs, ... }: { - require = [ ./base.nix ]; - # Don't include X libraries. services.openssh.forwardX11 = false; services.dbus.enable = false; # depends on libX11