From f49efc1039c373c0cb9771cc7208094e3c35a925 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 May 2008 16:34:50 +0000 Subject: [PATCH] module_aggregation renamed.. svn path=/nixos/trunk/; revision=11787 --- configuration/live-dvd-X-medium.nix | 4 ++-- configuration/live-dvd-X-no-soft.nix | 4 ++-- configuration/live-dvd-X.nix | 4 ++-- configuration/live-dvd.nix | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configuration/live-dvd-X-medium.nix b/configuration/live-dvd-X-medium.nix index cb495f9a296..d6532581017 100644 --- a/configuration/live-dvd-X-medium.nix +++ b/configuration/live-dvd-X-medium.nix @@ -20,7 +20,7 @@ let }; theKernel = pkgs: let baseKernel=pkgs.kernel; - in (pkgs.module_aggregation + in (pkgs.aggregateModules [ baseKernel (pkgs.kqemuFunCurrent baseKernel) @@ -50,7 +50,7 @@ in "user" "guest" "nix"]; kernel = pkgs: ( - pkgs.module_aggregation + pkgs.aggregateModules [pkgs.kernel] ); diff --git a/configuration/live-dvd-X-no-soft.nix b/configuration/live-dvd-X-no-soft.nix index 5b5c8d96829..fbde2a33274 100644 --- a/configuration/live-dvd-X-no-soft.nix +++ b/configuration/live-dvd-X-no-soft.nix @@ -20,7 +20,7 @@ let }; theKernel = pkgs: let baseKernel=pkgs.kernel; - in (pkgs.module_aggregation + in (pkgs.aggregateModules [ baseKernel (pkgs.kqemuFunCurrent baseKernel) @@ -50,7 +50,7 @@ in "user" "guest" "nix"]; kernel = pkgs: ( - pkgs.module_aggregation + pkgs.aggregateModules [pkgs.kernel] ); extraInitrdKernelModules = diff --git a/configuration/live-dvd-X.nix b/configuration/live-dvd-X.nix index ee5187b673b..b133b674267 100644 --- a/configuration/live-dvd-X.nix +++ b/configuration/live-dvd-X.nix @@ -20,7 +20,7 @@ let }; theKernel = pkgs: let baseKernel=pkgs.kernel; - in (pkgs.module_aggregation + in (pkgs.aggregateModules [ baseKernel (pkgs.kqemuFunCurrent baseKernel) @@ -50,7 +50,7 @@ in "user" "guest" "nix"]; kernel = pkgs: ( - pkgs.module_aggregation + pkgs.aggregateModules [pkgs.kernel] ); diff --git a/configuration/live-dvd.nix b/configuration/live-dvd.nix index df644a522ca..53a690f4366 100644 --- a/configuration/live-dvd.nix +++ b/configuration/live-dvd.nix @@ -17,7 +17,7 @@ in includeBuildDeps = true; kernel = pkgs: ( - pkgs.module_aggregation + pkgs.aggregateModules [pkgs.kernel] );