From 6d2c1eb83832119710aa62921bd291464d9ae467 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2008 15:36:56 +0000
Subject: [PATCH] * module_aggregation -> aggregateModules (naming convention).

svn path=/nixos/trunk/; revision=11785
---
 system/system.nix | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/system/system.nix b/system/system.nix
index 87fcb630f0ea..e65aef0a427e 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -40,6 +40,21 @@ rec {
     config.boot.initrd.kernelModules;
 
 
+  # Tree of kernel modules.  This includes the kernel, plus modules
+  # built outside of the kernel.  We have to combine these into a
+  # single tree of symlinks because modprobe only supports one
+  # directory.
+  modulesTree = pkgs.aggregateModules (
+    [kernel]
+    ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
+    ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi
+    # !!! this should be declared by the xserver Upstart job.
+    ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
+    ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007
+    ++ config.boot.extraModulePackages
+  );
+
+  
   # Determine the set of modules that we need to mount the root FS.
   modulesClosure = pkgs.makeModulesClosure {
     inherit rootModules;
@@ -70,7 +85,7 @@ rec {
       cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
       cp $udev/sbin/udevd $udev/sbin/udevtrigger $udev/sbin/udevsettle $out/bin
       nuke-refs $out/bin/*
-    '';
+    ''; # */
   
 
   # The init script of boot stage 1 (loading kernel modules for
@@ -134,21 +149,6 @@ rec {
     (map (mod: mod + "/lib") nssModules));
 
 
-  # Tree of kernel modules.  This includes the kernel, plus modules
-  # built outside of the kernel.  We have to combine these into a
-  # single tree of symlinks because modprobe only supports one
-  # directory.
-  modulesTree = pkgs.module_aggregation (
-    [kernel]
-    ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
-    ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi
-    # !!! this should be declared by the xserver Upstart job.
-    ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
-    ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007
-    ++ config.boot.extraModulePackages
-  );
-
-  
   # Wrapper around modprobe to set the path to the modules.
   modprobe = pkgs.substituteAll {
     dir = "sbin";