* Module aggregator: use buildEnv, which is much faster because it

creates symlinks lazily (i.e., it creates a single symlink to an
  entire tree unless another input has an overlapping tree).  As a
  result it creates only a few dozen symlinks instead of ~ 12000
  (which can take almost 2 minutes on my laptop).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15200

pkgs/os-specific/linux/module-init-tools/aggregator.nix

@@ -1,28 +1,27 @@
-{stdenv, module_init_tools, modules}:
+{stdenv, module_init_tools, modules, buildEnv}:
 
-stdenv.mkDerivation {
+buildEnv {
   name = "kernel-modules";
 
-  buildCommand = ''
+  paths = modules;
-    ensureDir $out/lib/modules
+
-    cd $out/
+  postBuild =
-    modules="${toString modules}"
+    ''
-    for i in $modules; do 
+      source ${stdenv}/setup
-        cp -rfs $i/* .
+    
-        chmod -R u+w .
+      kernelVersion=$(cd $out/lib/modules && ls -d *)
-        v=$(cd $i/lib/modules && ls -d *)
+      if test "$(echo $kernelVersion | wc -w)" != 1; then
-        if test -n "$version" -a "$v" != "$version"; then
+         echo "inconsistent kernel versions: $kernelVersion"
-            echo "kernel version mismatch: $version versus $v (in the module paths $modules)";
          exit 1
       fi
-        version=$v
+    
-    done
+      echo "kernel version is $kernelVersion"
-    echo "kernel version is $version"
+
-    rm -rf nix-support
+      # Regenerate the depmod map files.  Be sure to pass an explicit
-    cd lib/modules/
+      # kernel version number, otherwise depmod will use `uname -r'.
-    rm */modules.*
+      if test -w $out/lib/modules/$kernelVersion; then
-    #  linux-* will pass the new kernel version to depmod to take rather than `uname -r` (see man page)
+          rm -f $out/lib/modules/$kernelVersion/modules.*
-    MODULE_DIR=$PWD/ ${module_init_tools}/sbin/depmod -a $(basename lib/modules/2.*)
+          MODULE_DIR=$out/lib/modules/ ${module_init_tools}/sbin/depmod -a $kernelVersion
-    cd $out/
+      fi
     '';
 }

pkgs/top-level/all-packages.nix

@@ -7313,7 +7313,7 @@ let
 
   aggregateModules = modules:
     import ../os-specific/linux/module-init-tools/aggregator.nix {
-      inherit stdenv module_init_tools modules;
+      inherit stdenv module_init_tools modules buildEnv;
     };
 
   modutils = import ../os-specific/linux/modutils {