add a whole bunch of packages to make NixU a bit more useful:

- ssh
- shadowutils
- ping
- vim
- less
- strace
- ...

svn path=/nixu/trunk/; revision=1243

boot/builder.sh

@@ -16,6 +16,18 @@ for i in $boot $halt $login $env; do
         -e "s^@e2fsprogs\@^$e2fsprogs^g" \
         -e "s^@nettools\@^$nettools^g" \
         -e "s^@nix\@^$nix^g" \
+        -e "s^@wget\@^$wget^g" \
+        -e "s^@which\@^$which^g" \
+        -e "s^@subversion\@^$subversion^g" \
+        -e "s^@vim\@^$vim^g" \
+        -e "s^@screen\@^$screen^g" \
+        -e "s^@less\@^$less^g" \
+        -e "s^@openssh\@^$openssh^g" \
+        -e "s^@binutils\@^$binutils^g" \
+        -e "s^@strace\@^$strace^g" \
+        -e "s^@shadowutils\@^$shadowutils^g" \
+        -e "s^@iputils\@^$iputils^g" \
+        -e "s^@gnumake\@^$gnumake^g" \
         -e "s^@out\@^$out^g" \
         < $i > $dst
     chmod +x $dst

boot/default.nix

@@ -1,5 +1,6 @@
 { stdenv, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
-, nettools, nix}:
+, nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
+, binutils, strace, shadowutils, iputils, gnumake}:
 
 derivation {
   name = "boot";
@@ -10,5 +11,6 @@ derivation {
   login = ./login.sh;
   env = ./env.sh;
   inherit stdenv bash coreutils findutils utillinux sysvinit
-          e2fsprogs nettools nix;
+          e2fsprogs nettools nix subversion gcc wget which vim less screen
+          openssh binutils strace shadowutils iputils gnumake;
 }

boot/env.sh

@@ -1 +1 @@
-export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin:@nettools@/bin:@nettools@/sbin:
+export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin:@nettools@/bin:@nettools@/sbin:@gcc@/bin:@subversion@/bin:@which@/bin:@wget@/bin:@vim@/bin:@less@/bin:@screen@/bin:@openssh@/bin:@binutils@/bin:@strace@/bin:@shadowutils@/bin:@shadowutils@/sbin:@iputils@/bin:@gnumake@/bin

make-disk.sh

@@ -17,21 +17,24 @@ if ! test -f $image; then
 fi
 
 # What to copy?
-storeExpr=$(echo '(import ./pkgs.nix).everything' | nix-instantiate -)
+
-nix-store -rB $storeExpr
+NIX_CMD_PATH=/nix/bin
-nix-store -qn --requisites $storeExpr > $storePaths
+
+storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -)
+$NIX_CMD_PATH/nix-store -rB $storeExpr
+$NIX_CMD_PATH/nix-store -qn --requisites $storeExpr > $storePaths
 
 (while read storepath; do
-  nix-store -q --predecessors $storepath | (while read predecessor; do
+  $NIX_CMD_PATH/nix-store -q --predecessors $storepath | (while read predecessor; do
     echo $predecessor $storepath
   done) 
 done) < $storePaths > $successors
 
 # Location of sysvinit?
-sysvinitPath=$(nix-store -qn $(echo '(import ./pkgs.nix).sysvinit' | nix-instantiate -))
+sysvinitPath=$($NIX_CMD_PATH/nix-store -qn $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of Nix boot scripts?
-bootPath=$(nix-store -qn $(echo '(import ./pkgs.nix).boot' | nix-instantiate -))
+bootPath=$($NIX_CMD_PATH/nix-store -qn $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Fill the disk with the minimal Nix store.
 if ! test -d /tmp/mnt; then mkdir /tmp/mnt; fi

pkgs.nix

@@ -1,10 +1,10 @@
 rec {
-  inherit (import pkgs/system/i686-linux.nix)
+  inherit (import /usr/home/nix/nixpkgs-0.6pre1121/pkgs/system/i686-linux.nix)
     stdenv bash coreutils findutils utillinux sysvinit e2fsprogs
-    nettools nix;
+    nettools nix subversion gcc wget which vim less screen openssh binutils strace shadowutils iputils gnumake;
 
   boot = (import ./boot) {inherit stdenv bash coreutils findutils
-    utillinux sysvinit e2fsprogs nettools nix;};
+    utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim less screen openssh binutils strace shadowutils iputils gnumake;};
 
   everything = [boot sysvinit];
 }

run.sh

@@ -3,5 +3,5 @@
 image=/tmp/disk.img
 
 linux ubd0="$image" mem=256M \
-  eth0=tuntap,tap4,,192.168.150.1 \
+  eth0=tuntap,tap1,,192.168.150.3 \
   init="/init"