From 57f29aca821bd2a4dceb4c851ccd8e9d9bcfa4dc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 24 Mar 2008 19:40:15 +0000
Subject: [PATCH] all-packages.nix changes for all previous commits..

svn path=/nixpkgs/trunk/; revision=11276
---
 pkgs/top-level/all-packages.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dab7bd226ab3..c5523474de64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -270,7 +270,7 @@ let pkgs = rec {
     inherit stringsWithDeps lib stdenv writeScript fetchurl;
   };
 
-  builderDefsPackage = expr: lib.sumArgs 
+  builderDefsPackage = expr: lib.composedArgs 
     (((builderDefs null).builderDefsPackage builderDefs) expr);
 
   stringsWithDeps = import ../lib/strings-with-deps.nix {
@@ -368,9 +368,10 @@ let pkgs = rec {
 
   makeWrapper = makeSetupHook ../build-support/make-wrapper/make-wrapper.sh;
 
-  makeModulesClosure = {kernel, rootModules}: import ../build-support/kernel/modules-closure.nix {
-    inherit stdenv module_init_tools kernel rootModules;
-  };
+  makeModulesClosure = {kernel, rootModules, allowMissing ? false}: 
+    import ../build-support/kernel/modules-closure.nix {
+      inherit stdenv module_init_tools kernel rootModules allowMissing;
+    };
 
   # Run the shell command `buildCommand' to produce a store object
   # named `name'.  The attributes in `env' are added to the
@@ -4175,8 +4176,12 @@ let pkgs = rec {
       [(getConfig ["kernel" "addConfig"] "")];
   };
 
-  kqemuFun = lib.sumArgs (selectVersion ../os-specific/linux/kqemu "1.3.0pre11") {
-    inherit fetchurl stdenv builderDefs;
+  customKernel = lib.sumArgs (import ../os-specific/linux/kernel/linux.nix) {
+    inherit fetchurl stdenv perl mktemp module_init_tools lib;
+  };
+
+  kqemuFun = builderDefsPackage (selectVersion ../os-specific/linux/kqemu "1.3.0pre11") {
+    inherit builderDefs;
   };
 
   # No finished expression is provided - pick your own kernel