* Use runCommand.

svn path=/nixos/trunk/; revision=7300

configuration/boot-environment.nix

@@ -44,21 +44,19 @@ rec {
   # Some additional utilities needed in stage 1, notably mount.  We
   # don't want to bring in all of util-linux, so we just copy what we
   # need.
-  extraUtils = pkgs.stdenv.mkDerivation {
+  extraUtils = pkgs.runCommand "extra-utils"
-    name = "extra-utils";
+    { buildInputs = [pkgs.nukeReferences];
-    builder = builtins.toFile "builder.sh" "
+      inherit (pkgsStatic) utillinux;
-      source $stdenv/setup
+      inherit (pkgs) splashutils;
+      e2fsprogs = pkgs.e2fsprogsDiet;
+    }
+    "
       ensureDir $out/bin
       cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
       cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin
       cp $splashutils/bin/splash_helper $out/bin
       nuke-refs $out/bin/*
     ";
-    buildInputs = [pkgs.nukeReferences];
-    inherit (pkgsStatic) utillinux;
-    inherit (pkgs) splashutils;
-    e2fsprogs = pkgs.e2fsprogsDiet;
-  };
   
 
   # The init script of boot stage 1 (loading kernel modules for
@@ -99,14 +97,14 @@ rec {
 
   # The installer.
   nixosInstaller = import ../installer/nixos-installer.nix {
-    inherit (pkgs) stdenv substituteAll;
+    inherit (pkgs) stdenv runCommand substituteAll;
     inherit nix;
   };
 
 
   # The services (Upstart) configuration for the system.
   upstartJobs = import ../upstart-jobs/gather.nix {
-    inherit (pkgs) stdenv;
+    inherit (pkgs) runCommand;
 
     jobs = map makeJob [
       # Syslogd.
@@ -241,7 +239,7 @@ rec {
 
   
   makeJob = import ../upstart-jobs/make-job.nix {
-    inherit (pkgs) stdenv;
+    inherit (pkgs) runCommand;
   };
 
 

installer/nixos-installer.nix

@@ -1,4 +1,4 @@
-{stdenv, substituteAll, nix}:
+{stdenv, runCommand, substituteAll, nix}:
 
 substituteAll {
   src = ./nixos-installer.sh;
@@ -8,9 +8,7 @@ substituteAll {
 
   pathsFromGraph = ../helpers/paths-from-graph.sh;
 
-  nixClosure = stdenv.mkDerivation {
+  nixClosure = runCommand "closure"
-    name = "closure";
+    {exportReferencesGraph = ["refs" nix];}
-    exportReferencesGraph = ["refs" nix];
+    "cp refs $out";
-    builder = builtins.toFile "builder.sh" "source $stdenv/setup; cp refs $out";
-  };
 }

instances/rescue-cd.nix

@@ -20,32 +20,23 @@ rec {
 
 
   # Since the CD is read-only, the mount points must be on disk.
-  cdMountPoints = pkgs.stdenv.mkDerivation {
+  cdMountPoints = pkgs.runCommand "mount-points" {} "
-    name = "mount-points";
-    builder = builtins.toFile "builder.sh" "
-      source $stdenv/setup
     ensureDir $out
     cd $out
     mkdir proc sys tmp etc dev var mnt nix nix/var
     touch $out/${cdromLabel}
   ";
-  };
 
 
   # We need a copy of the Nix expressions for Nixpkgs and NixOS on the
   # CD.  We put them in a tarball because accessing that many small
   # files from a slow device like a CD-ROM takes too long.
-  makeTarball = tarName: input: pkgs.stdenv.mkDerivation {  
+  makeTarball = tarName: input: pkgs.runCommand "tarball" "
-    name = "tarball";
-    inherit tarName input;
-    builder = builtins.toFile "builder.sh" "
-      source $stdenv/setup
     ensureDir $out
-      (cd $input && tar cvfj $out/$tarName . \\
+    (cd ${input} && tar cvfj $out/${tarName} . \\
       --exclude '*~' --exclude '.svn' \\
       --exclude 'pkgs' --exclude 'result')
   ";
-  };
 
   
   # Put the current directory in the tarball.  !!! This gives us a lot

upstart-jobs/gather.nix

@@ -1,19 +1,13 @@
 # Create an etc/event.d directory containing symlinks to the
 # specified list of Upstart job files.
-{stdenv, jobs}:
+{runCommand, jobs}:
 
-stdenv.mkDerivation {
+runCommand "upstart-jobs" {inherit jobs;}
-  name = "upstart-jobs";
+  "
-
-  inherit jobs;
-
-  builder = builtins.toFile "builder.sh" "
-    source $stdenv/setup
     ensureDir $out/etc/event.d
     for i in $jobs; do
       if test -d $i; then
         ln -s $i/etc/event.d/* $out/etc/event.d/
       fi
     done
-  ";
+  "
-}

upstart-jobs/make-job.nix

@@ -1,7 +1,4 @@
-{stdenv}: job:
+{runCommand}: job:
 
-stdenv.mkDerivation {
+runCommand job.name {inherit (job) job;}
-  inherit (job) name job;
+  "ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$name"
-  builder = builtins.toFile "builder.sh"
-    "source $stdenv/setup; ensureDir $out/etc/event.d; echo \"$job\" > $out/etc/event.d/$name";
-}